Update aliases and colours
Merge branch 'master' of github.com:abangratz/dotfiles

* 'master' of github.com:abangratz/dotfiles:
  Fix irbrc, add pryrc, add stuff to vimrc
  Update vromerc: remove disabled text
  Add vromerc
  Various changes

Conflicts:
	vimrc