Initial bootstrap stuff
Merge branch 'master' of github.com:pcrglennon/justin-peter