Do not show expired auth tokens on authorizations page
Force mobile recovery flow when 2FA is requested and user does not have mobile #
Add an unsubscribe link to notification emails

- create an UnsubscribeToken class that works similar to AuthenticationToken
- create notifications/unsubscribe route to handle unsubscribe action
- add unsubscribe link to mailer with email and raw token for authentication
Merge branch 'devel' into hotfix/hide_expired_apps
Merge branch 'devel' into feature/notifation_unsubscribe

Conflicts:
	spec/models/notification_spec.rb
Support other delivery methods in unsubscribe
Update ruby to 2.1.3
Merge pull request #422 from 18F/feature/force_2fa_enrollment

Force mobile recovery flow when 2FA is requested and user does not have ...
Merge pull request #425 from dlapiduz/ruby-update

Update ruby to 2.1.3
WIP
fix admin user factories (mobile number issues)
Merge branch 'devel' into feature/notification_settings

Conflicts:
	app/models/user.rb
	db/schema.rb
Merge branch 'hotfix/fix_2fa_spec' into feature/notification_settings
Merge pull request #427 from 18F/hotfix/fix_2fa_spec

fix admin user factories (mobile number issues)
Update content to comply with Privacy Act requirements

The Privacy Act requires us to talk about our information
collection DIRECTLY on the page that collects that information.
While it has the best intentions, it really just results in a
lot of small type.  A future action for us is to user test
what do users want to know, and remove these silly disclaimers.

In order to be compliant, the following items have changed:

- Rename to "Terms of Service" everywhere
- Add Privacy Act notice to profile edit, additional info edit,
  and authorization page
- Add an explicit line before "Allow Access" that tells the
  user their information will be shared (Privacy Act requirement)
- Use the Privacy Act notice provided by GSA OGC
Move privacy act statement to a partial

Since we're going to reuse the text, it would be nice to only
have 1 place to maintain it.
Merge pull request #428 from 18F/hotfix/privacy-act

Update content to comply with Privacy Act requirements
Separate one-click unsubscribe and notifications settings

Create a controller just for one-click unsubscribe

Create a settings controller with a notifications page
Create Authorization model and use it to maintain notification settings

Move notification settings to authorization object (one per authorizated user/application pair)
Add a make public button to admin page