updated macros
Merge branch 'develop' of github.com:ryanolson/flask-bootstrap3 into develop