fixes #55: removed vi from forbidden, added aliase to rvim
fixes #56: corrected custom intro to print nicely
Merge branch 'master' of git://github.com/ghantoos/lshell

Conflicts:
	lshell/checkconfig.py
Merge branch 'refs/heads/master' into 0.9.16.2-om8