cleaned up and ready for alpha
Merge pull request #8 from rmcdole/master

cleaned up and ready for alpha