update aliases
fix json-format alias to <cr> automatically
rvm bollocks
Merge branch 'master' of https://github.com/stuarthicks/etc

Conflicts:
	zshrc