first commit
use actual file instead of symlink for .vimrc
remove Modernizr from default .jshintrc
updated .jshintrc to use many of the jquery defaults
added file for better handling git merging and diffing with vim
show line numbers by default in vim
added .gitignore
include local .gitignore for dotfiles
track diffconflicts file
merged changes from origin/master
Indent content under help for easier reading