Some fixes and additions
Merge branch 'master' of github.com:eboskma/dotfiles

Conflicts:
	gem/gemrc
	vim/vimrc