Backing up dotfiles before upgrade to Yosemite
Merge branch 'master' of github.com:olanmatt/dotfiles

* 'master' of github.com:olanmatt/dotfiles:
  Fixed aliases for Ubuntu 14.04