Updated nerdtree
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:jb55/dotfiles
master
fix ssh agent forwarding in screen
Merge remote-tracking branch 'origin/master'

Conflicts:
	.zshrc
Fix aliases
Fix js syntax checker
various changes
Merge branch 'master' of github.com:jb55/dotfiles

Conflicts:
	.xmonad/xmonad.hs
	.zshrc
Merge branch 'master' of github.com:jb55/dotfiles

Conflicts:
	.gitmodules
	.vim/bundle/nerdtree
Merge branch 'master' into osx