better .nvmrc handling

fix mocha test output with solarized dark

3.1.0, improves vim, font install via homebrew cask, etc

once more, with feeling

remove default username/email

note about terminal running and history updates

fix issue atomantic#6

using vimdiff instead of diffmerge

adding settings to readme