[vim] Install vim config files for scala
[bash] Add hour in prompt
Merge remote-tracking branch 'origin/master' into HEAD