Migrated to awesome 3.5; cleaned up zsh stuff
Migrated to awesome 3.5; cleaned up zsh stuff
Merge branch 'master' of github.com:nedludd/dotfiles

Conflicts:
	awesome/shifty