Update how trial periods work when switching subscriptions
Merge branch 'master' of github.com:codelation/rails-templates
Fix invoice spec