updating ll alias
Merge branch 'master' of github.com:whoughton/dotfiles

Conflicts:
	aliases