Enable saving write protected files
Merge branch 'master' of github.com:rbeagrie/dotfiles

Conflicts:
	.vimrc