Added typescript
Updated indent colors for wombat256
un-windowize typescript and add typescript autocommand
Remove osx specific from master
Added tmp dir to vim path
Added vim-ag
Mapping for closing the quickfix window
Merge branch 'master' of github.com:jb55/dotfiles
Update xmonad config, simple shell
I dont remember

Conflicts:
	.vim/.vimrc
	.vim/bundle/syntastic
neocachecompl

Conflicts:
	.vim/.vimrc
Added log aliases for git
Revert "neocachecompl"

This reverts commit 141baa5eaa5b70fe43f908efb941ec0b931b3d0c.
xmonad: Windows key as meta key
some stuff
Merge branch 'master' into osx

Conflicts:
	.gitmodules
	.vim/.vimrc
	.xmonad/xmonad.hs
	.zshrc