commit before merge
Merge branch 'templating' of https://github.com/CrossTheStreams/magneato into templating

:q