Martha change request.
Merge branch 'rails4' of github.com:CruGlobal/sp into rails4

# By Josh Starcher
# Via Josh Starcher
* 'rails4' of github.com:CruGlobal/sp:
  Fix payment editing
  Tell travis to load the schema instead of running migrations
  Update schema.rb
  Use sudo and apt-get instead of aptitude
  Try installing freeimage on travis
  Travis fix
  Fix travis database.yml
  Be specific about which database.yml file we want to ignore
  Use https version of gems
  Disable strict host checking for github on travis
  Get rid of page caching and sweeper
  Apply Eli's changes to the rails4 branch

Conflicts:
	app/assets/stylesheets/frontend.css.scss