Remove some reminants of a past bad git merge
Merge pull request #12 from cmaloney/fix_bad_merges

Remove some reminants of a past bad git merge