added more requirements
added escpace shortcut
Merge branch 'master' of github.com:oelu/dotfiles

Conflicts:
	.vimrc.local
	bootstrap/base-system.sh