vimrc bash_alias
Merge branch 'develop'