Add laloppy bindings
Merge branch 'master' of github.com:timwraight/Dotfiles
Add a couple of aliases
Merge branch 'master' of github.com:timwraight/Dotfiles

Conflicts:
	tim.zsh