move templates around
Merge branch 'master' of github.com:fliphess/PushMon