add help mappings for a number of features
add help mappings for a number of features
remove <leader>w mapping to remove all trailing whitespace
merge conflict correction
Merge pull request #26 from salcode/salcode-helper-mappings

add helper mappings for a number of features
document git commit error

Add documentation on how to correct the error
```error: There was a problem with the editor 'vi'.
Please supply the message using either -m or -F option.```
Solution comes from
http://tooky.co.uk/there-was-a-problem-with-the-editor-vi-git-on-mac-os-x/
Limit remove trailing whitespace by filetype

Limit remove trailing whitespace automatically on save
by filetype. Only remove on these filetypes c,cpp,java,php,javascript.

Motivation to add this restriction is markdown files specifically.
Merge pull request #33 from salcode/filetype-remove-trailing-whitespace

Limit remove trailing whitespace by filetype
Merge pull request #32 from salcode/document-vim-git-commit-fix

document git commit error
- remaping NERDTree and PDV

Just seems to make more sense fore everyone to make NERDTree <leader>n
and PDV (which is for documentation) <leader>d.

Make it so number one.
Merge branch 'curtismchale'

Conflicts:
	.vimrc