Added aliases
Merge branch 'master' of https://github.com/pilf/vim-files

Conflicts:
	env/bash/bashrc-std.sh.inc