updates to local git config file
nerdtree and rspec mappings
merging