fix logic error in withoutNulls
Merge branch 'master' of github.com:wess/Annex

Conflicts:
	Annex/AnnexKeyChain.m
Merge branch 'master' of github.com:NudgeApps/Annex

Conflicts:
	Annex/AnnexKeyChain.m