bleh
Merge branch 'template' of https://github.com/soney/interstate into template