update styles
Merge branch 'master' of https://github.com/jamesgowans/jamesgowans

Conflicts:
	node_modules/.bin/express
	node_modules/.bin/jade
	node_modules/.bin/marked
	node_modules/.bin/stylus
	node_modules/jade/node_modules/constantinople/node_modules/.bin/uglifyjs
	node_modules/jade/node_modules/transformers/node_modules/.bin/uglifyjs
	node_modules/jade/node_modules/with/node_modules/.bin/uglifyjs