Move shared macros to includes/macros.jinja2

Found a way to make this work, when importing macros, need to import them into a variable/namespace like thing.

Import as "m" to keep it nice and short.