Merge branch 'master' into templating
joey t 2
joey t3
Merge branch 'templating' of github.com:CrossTheStreams/magneato into templating
boom
Merge branch 'templating' of github.com:CrossTheStreams/magneato into templating
joey