Update defaults to use VIM instead of VI, enable color for
diffs
Add default .bashrc as well
Update the keyboard selection dialog in the installer to remember the current keyboard settings and reset back to them if the dialog is closed without being cancelled.
Merge branch 'master' of github.com:pcbsd/pcbsd
Merge remote-tracking branch 'upstream/master'