updated some things. And stuff.
Merge branch 'master' of github.com:Iteam1337/iteam-se.docpad