cleanup, test readiness
Merge pull request #1 from bitemyapp/master

Cleanup, test readiness