Merge pull request #617 from leider/master

bumping jade to version 1.2 thereby moving some mixins and also changing...
wiki changes now with authors
reverting accidental change
renaming the title