jade plugin
Merge branch 'master' of github.com:fitztrev/trevdev

Conflicts:
	vim/.vimrc