Updated Dotfiles
Merge branch 'master' of https://github.com/br0xen/.dotfiles

Conflicts:
	.bash_profile
	.vimrc