Changed to show simple status with branch name, added some more ruby
aliases
Merge branch 'master' of https://github.com/tmcinerney/dotfiles

Conflicts:
	git/gitconfig.symlink