Added zaw
Note: see http://blog.patshead.com/2013/04/more-powerful-zsh-history-search-using-zaw.html
Merge branch 'origin/master'
Merge branch 'origin/zaw'

Conflicts:
	.gitmodules