Changed checkout aliases
Removed RVM support
Added work specific aliases
Changed checkout aliases
Removed RVM support
Added work specific aliases
Merge branch 'work' of github.com:rickyah/dotfiles into work

* 'work' of github.com:rickyah/dotfiles:
  Added work specific aliases
  Removed RVM support
  Changed checkout aliases
Add support for php repositories
Homebrew now installs php54
Install PHP Composer at work
Merge branch 'work' of github.com:rickyah/dotfiles into work

* 'work' of github.com:rickyah/dotfiles:
  Changed work email
  Install PHP Composer at work
  Homebrew now installs php54
  Add support for php repositories
  Added work specific aliases
  Removed todo st2 plugin
  Fixes typo in git alias
  Using rbenv as default version manager for ruby
  Add git rebase aliases
  Add more git aliases
  Used light soda theme for subline
  Add git alias to show tracked branches
  Changed git aliases
  Ignoring some files when symlinking the sublime text 2 user directory
  Disable loading RVM as a shell function
  Added settings from home computer

Conflicts:
	.bash_profile
	.gitconfig