setting rspec to use bin/rpec
Merge branch 'master' of github.com:danielnolan/dotfiles

Conflicts:
	vimrc
Merge branch 'master' of github.com:danielnolan/dotfiles
fixing path so that /usr/local/bin is loaded first
changing editor to just vim, since resolving the path issue