Added shortcuts for `spring rspec` and `spring rspec spec`.
Added a global git alias for finding all files containing merge conflicts during rebase.