Updating with latest work stuf
Merge branch 'master' of https://github.com/spiralman/spiralman.github.com