This doesn't appear to be doing anything
Merge branch 'master' of github.com:thedustinsmith/static-template