Revert "Merge Bmiller"
Merge pull request #3 from dudemire/revert-2-master

Revert "Merge Bmiller"