move some things around and update readme
Merge pull request #3 from ludicruz/master

Some cleanup updates and better readme