Cherry picks NSURL
Removes conflict error and also selectors that were never implemented
Adds simple NSObject subclass for working with JSON/Dictionaries to properties
bflargsd
Adds simple NSObject subclass for working with JSON/Dictionaries to properties
Merge branch 'json-object' of github.com:wess/Annex