Updated dotfiles
Merged with remote
Merge branch 'master' of github.com:Joshkunz/.files

Conflicts:
	.bashrc
	.vimrc