This is mostly formatting, and and a new Godep
Merge pull request #6 from indykish/master

This is mostly formatting, and and a new Godep