Added bash.bashrc.local
Added editor vim
Merge branch 'development'