Adds vim-rspec and a few tweaks
Merge branch 'master' of github.com:stevehook/dotfiles

Conflicts:
	files/iterm/com.googlecode.iterm2.plist