Solorized colour scheme for gedit
Alias for git status
Merge branch 'master' of https://github.com/kingamajick/.dotfiles

Conflicts:
	bash_aliases