Incorporate changes from ejacobs and make subscription-management steps optional. #29

Closed detiber closed 9 years ago