All da code
Merge pull request #1 from stkem/master

Moving all the code over from my personal repo