added aliases to zshrc
Cleaning things up

Merge branch 'master' of https://github.com/mikeastock/.dotfiles
changed zsh theme