Updated README.md
Update rake
Update Rails to 4.0.2
Automatically fix some rubocop issues with "rubocop -a"
Rename is_weekday? to weekday?
Only show rubocop documentation issues outside of db migrations
Always start comments with a space
Do not ignore line length and method length issues, but do ignore config files
Fix line length issues
Use Array#reduce for hours_for
Remove Location#open_on? and check for hour presence directly to simplify code
Minor refactor in the LocationsHelper
Ignore documentation-related rubocop issues for test files
Refactor Location#adjust_times with a Proc
Merge branch 'master' into new-backend

Conflicts:
	Gemfile.lock
	app/helpers/locations_helper.rb
	app/models/location.rb
	db/seeds.rb
Fix some errors where Location attributes that were removed were still used