Check if gui is running when setting sh

* Setting shell only for terminal vim otherwise stuff like Ag does not
work in mvim.
Drop drb from rspec_command
Merge branch 'master' of github.com:sajoku/dotfiles

Conflicts:
	vimrc