Initial commit
Adds Kaleidoscope diff/merge tool
Follows symlinks to version controlled files by default
Adds script header so emacs syntax highlighting works
Adds git status alias (gs)
Ignores zsh cache
Removes cedet and ecb, wasn't being used
Adds emacs dependencies
Ignores autocomplete history
Changes jade-mode to be a submodule
Correctly aliases "ls" to provide color output for OSX as well as Linux
Adds ksmerge alias for merging via Kaleidoscope on OSX
Fixes issue with XCode clobbering merges by modifying ctime
Updates .gitignore to include .DS_Store and emacs temp files
Removes vcs coloring aliases
Adds OSX specific PATH additions
When connected via SSH prompt will now be blue
Changes deprecated "tracking" push.default to "upstream"
Adds coffee-mode and moves locaton of jade-mode
Adds back jade submodule