v1: make service plans first-class citizens
Merge pull request #4 from kushmerick/master

Improved V1 support for service plans