vault: local changes
Merge branch 'local'

Conflicts:
	bash/bash_profile
	bash/bashrc