Merge pull request #16 from bcotton/master

Rearrange all the things