Added aliases from bash profile
Merge branch 'master' of github.com:vikfroberg/dotfiles