Added settings from home computer
Disable loading RVM as a shell function
Ignoring some files when symlinking the sublime text 2 user directory
Changed git aliases
Changed work email
Config changes
Merge branch 'work' of github.com:rickyah/dotfiles into work

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

Conflicts:
	.bash_profile
	.gitconfig