#44 First portion of API 2.0 spec fixes
Merge pull request #47 from killthekitten/fix-api2.0-specs

#44 First portion of API 2.0 spec fixes