Merge remote-tracking branch 'ben/master'
GetContents now returns an NSArray instead of NSDictionary
Merge remote-tracking branch 'jesse/master'
setting up to hook to Jesse’s new get contents interface.