update with git gtp aliases
Merge branch 'master' of github.com:lwm/dotfiles
merge conflict resolve with javascript suntax plugin
add git status alias
fixed merge conflict