EOL
Merge branch 'master' of https://github.com/holman/dotfiles
Updating `grm` alias to support rm of resources where path contains spaces

`awk '{print $3}'` will give us the path following `deleted:` in the git status
output, but not the full path if it contains spaces.
`awk '{$1=$2=""; print $0}'` effectively removes `#` and `deleted:` from the
grepped line, allowing us to retrieve the remainder with `$0`. Following this
we filter out spaces at the beginning of the line and escape all remaining
spaces with `awk` and `sed`.

I suppose this could be done more elegantly (maybe
`awk '{print substr($0, 0, N)}'` where `N` is equal to the number of characters
preceding our desired path), but I honestly can't be certain of git's behavior
to expect it to work the same all the time (i.e. is it always 14 characters?
what about tabs?). Probably a noob issue...
Merge pull request #93 from boaf/grmfix/grmfix-allow-spaces

Updating `grm` alias to support rm of resources where path contains spaces
Allow $EDITOR to be set up elsewhere
Merge branch 'master' of https://github.com/holman/dotfiles
Fix syntax error
Don't show a version if rbenv can't switch to it
Fixed syntax error
Merge pull request #94 from OmeGak/fix-e

Fixed syntax error
Fix seds treatment of tabs

Per https://github.com/holman/dotfiles/commit/3d2a856d2475f8c7e6cff6117652f92542cb6247#commitcomment-3561553.
Merge pull request #95 from boaf/tab-character-fix

Fix sed's treatment of tabs
Add `res`

`res` is a small script that facilitates switching between screen
resolutions super quickly and easily.
Update gitconfig to use osxkeychain for OSX and cache for other systems
Merge pull request #96 from snichme/git_cred

Update gitconfig to use osxkeychain for OSX and cache for other systems
Merged upstream
Additional merge fixes