updating dotfiles
Merge branch 'master' of https://github.com/ninjaaron/configs

Conflicts:
	shell/vim/spell/en.utf-8.add
	shell/vim/spell/en.utf-8.add.spl
Merge branch 'master' of https://github.com/ninjaaron/configs
Merge branch 'master' of https://github.com/ninjaaron/configs
updating dotfiles
Merge branch 'master' of https://github.com/ninjaaron/configs

didn't update properly