Local mods
Merge branch 'develop' of github.com:dreamiurg/bash-ext into develop

Conflicts:
	vimrc