Merge branch 'master' of github.com:xeniatay/dotfiles

* 'master' of github.com:xeniatay/dotfiles:
  Adding alias
  Added install package control notes to readme
  New stuff
  Update README.md
  Update README.md

Conflicts:
	zsh_nocorrect
	zshrc
Merge branch 'master' of github.com:xeniatay/dotfiles

* 'master' of github.com:xeniatay/dotfiles:
  updates
  stripe testing deets
  Ugh stupid. This fixes everything
  Update README.md
  Woo
  Adding gitattributes
  Wanderable beta stuff. no crappy whitespace issues.

Conflicts:
	zsh_nocorrect
	zshrc
gems