Merge branch 'master' of https://github.com/renyard/dotfiles

Conflicts:
	gitignore
Added Sublime Text Package Control cache files to .gitignore.
Merge branch 'master' of https://github.com/renyard/dotfiles