zap all mentions of the "organization" subscription plan from the code since Stripe no longer knows about it
define default sort order for audio files #688
Get latest upstream changes to master
upgrade to devise gem in f724854ea30ea78bddc9cf1eb7d7b26f4ef15472 broke password reset token. Fix per http://stackoverflow.com/questions/18661663/upgrading-to-devise-3-1-getting-reset-password-token-is-invalid
Merge branch 'master' of https://github.com/popuparchive/pop-up-archive
Updated Enterprise Page

Changed user quote, updated feature info, moved contact button up,
changed styling for “contented clients”

Also created moved enterprise styling info from base to its own sass
partial
merge emily/enterpise-revised from #717