Saved Manifest
Merge branch 'master' of github.com:neckerson/dotfiles-joshuaclayton

Conflicts:
	vim/colors.vim