Removed feature_toggling.
Ruby 2.1.1.
Ruby 2.1.1.
Fixed null cleanup case.
merged usptream and bundle update
changed rvm bag name
added migration of affiliate, format validation and tests
changed affiliate to render as a link
changed rendering of affiliate link to be correct, and bundle update
Updated bundle, fixed hyperlink helper to conform with ocean-rails.
REALLY made the change...
merged upstream master
added affiliate link in factory for tests now
fixed tests for api_user
Merge branch 'staging' into prod