Changed ll alias to include hidden files
Fixing glog and gba aliases
Merge branch 'master' of github.com:gehrhorn/oh-my-zsh

Conflicts:
	plugins/git/git.plugin.zsh
Edit gitignore