Rework the makefile
Prep for 2.0-alpha6 release
Merge pull request #17 from bwood/master

Alpha 6 release