Tweaked gstu git alias.
Added aliases for git merge and git merge (no fast-forward).
Added alias for git remote prune.
Added vagrant aliases.
Added an alias for git merge --no-ff.
Cleaned up the alias for grep and GREP_COLOR option.
Added ~/.rvm/bin to path.