added slate config
fancy new prompt
merged in new slate.js
merged in new slate shortcuts
Merge branch 'work'
chruby auto ruby 2.0
added bundler to ignore
Merge branch 'master' of https://github.com/michaelgruber/dotfiles
Merge branch 'work'
Merge branch 'work'
Merge branch 'master' of github.com:michaelgruber/dotfiles
merged in work changes
added git annex
merged gitconfig changes
Merge branch 'work'

Conflicts:
	.bash_profile
	.gitignore
merging work
more ignores
moved aliases line cuz
Merge branch 'work'

Conflicts:
	.bash_profile
merge