merge :(
Merge branch 'dotfiles'

Conflicts:
	jshintrc
	phoenix.js
	vim/UltiSnips/stylus.snippets
	vim/pluginsrc
	vimrc
	zshrc