update vimrc
update aliases
Merge branch 'new' of https://github.com/justjake/Dotfiles into new

Conflicts:
	vimrc
	zsh/rc.d/20_aliases.zsh