Updated dotfiles
Merge branch 'master' of http://github.com/peterlebrun/dotfiles

Conflicts:
	.vimrc