update jade mixins and stylus view helpers
Merge branch 'master' of https://github.com/jansanchez/html6
conflicto con master