Updated ST settings.
Trying out bitdeli.
Added git-merged-branches function.
Revert "Updated ST settings."

This reverts commit 0523940afe8b39b1757f58573a6644761c515f35.
Merge branch 'release/2.1.0'
Fixed rclone-cwx to clone into correct folder.
Merge branch 'release/2.1.1'
Added rtravis to open the Travis CI web interface for the current repo.
Merge branch 'release/2.2.0'
Updated sublime settings.
Updated setup-new-machine script.
Added php-cs-fixer to new machine setup script.
Added php55-sqlite
rtravis now takes you to the builds list.
Annoy.
Moved matching of exact directory names after repository names to avoid false hits on vendor names that match their project names.
Merge branch 'release/2.2.1'
rcd now prompts interactively when multiple matches are found.
Merge branch 'release/2.3.0'
Merge branch 'master' of github.com:jmalloc/dotfiles

Conflicts:
	lib/aliases.bash
	res/sublime-settings.json
	setup-new-machine