4 Commits

Author	SHA1	Message	Date
Brian Wylie	455e3fe06b	fix old merge conflict	2014-12-29 21:53:46 -07:00
Brian Wylie	166041f2b6	fixing merge	2014-12-29 15:29:11 -07:00
Brian Wylie	1076faa08d	initial work on setup/tox	2014-12-18 08:48:20 -07:00
Brian Wylie	4cab437e66	adding a python based .gitignore	2014-11-12 08:41:56 -07:00