fixes incorrect use of instancetype
lets dictionaryWithJSON: return nil, it should be safe.
Merge branch 'master' of github.com:NudgeApps/Annex
use proper format specifiers for NSInteger
fix logic error in withoutNulls
Merge branch 'master' of github.com:wess/Annex

Conflicts:
	Annex/AnnexKeyChain.m