manually merge some pull requests

fix for Rails 4 routing
subscription belongs to plan
stop referring to owner as :user
freemium support, setting plan after invoice items added, refactor setting owner
bump version a smudge