Eliminated the default - I don't remember why
Merge branch 'master' of github.com:derekwyatt/dotfiles
Various simplifications of my life
Fixed the EDITOR variable
Merge branch 'master' of github.com:derekwyatt/dotfiles
Added SBT permgen setting. Added SML to the path on mac
changes
Merge branch 'master' of https://github.com/derekwyatt/dotfiles
Added some PATH cleanups
Updated the plugin to work with changed behavior of cd command; added the ctags file that includes information about scala
Added pgrep alias; updates to themes and some rxvt themes
Merge branch 'master' of https://github.com/derekwyatt/dotfiles
Hacky update that keeps the path truncated propertly
Some work settings and prompt hacks

- I needed to set some stuff for where I work
- Also, branch names here are HUGE, so I added some hacky stuff (not really "oh
  my zsh" correct, but it works) to trim my prompt
Finally got around to fixing the colour for links - they were black :D
prompt pruning fixes
Merge pull request #1 from derekwyatt/master

merging from master