Improving bootstrap appearance, etc
added special layout for homepage
Make the footer appear globally
Fixed broken tests
Column layout for footer area
css styling
updated branding
Merge https://github.com/bashton37/3000acres into branding

Conflicts:
	app/controllers/application_controller.rb
	app/views/devise/mailer/reset_password_instructions.html.haml
Merge commit '3f1684bfcdc080a97abd85e631e57d046abc1790' into branding

Conflicts:
	app/assets/images/3000acres_logo.png
	app/views/layouts/_footer.html.haml
Updated logo to use Brian's version
Removed carousel (not in plan, can re-add later)
Removed quantities/stats (not in plan, can re-add later)
Added open source links to footer
Reverted social media links to text until Brian can give us proper alt tags
Fixed target=blank on footer links
Fixed token to match other emails
Merge pull request #23 from Skud/branding

Branding