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