use bundler alias
use colors file in prompt
bunch of prompt changes
sublime text 2 stuff... so. much. stuff.
fix history stuff for multi-session history tracking