Merge pull request #156 from NYC-Camp/master

merging of master into commerce branch. merging to start work on #115