changes
Merge branch 'master' of github.com:gibiansky/dotfiles

Conflicts:
	configuration.vim