Dont need fakeclip in master
Some changes for my ubuntu desktop
Merge remote-tracking branch 'origin/master'

Conflicts:
	.zshrc
Added tmuxa
Toggle prompt mappings for ctrlp
Added proper coffeescript syntax highlighting
Revert "Toggle prompt mappings for ctrlp"

This reverts commit a503909cf807169f03b1f094ab399de3432fb4e9.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.zshrc
Merge branch 'osx'

Conflicts:
	.gitmodules
	.vim/.vimrc
	.xmonad/xmonad.hs
	.zshrc
gitconfig changes
gitconfig changes
update vimrc
Update vim scripts
sorry
reattach-to-user-namespace tmux
Merge branch 'master' into osx

Conflicts:
	.vim/bundle/gitgutter
Update snippets
Merge branch 'master' into osx