move macros into _macros.html
Merge pull request #5 from voltaire/template-macro-cleanup

move macros into _macros.html