Updated gemfile to rails4
Remove whiny_nils, add eager_load.

whiny_nils is no longer needed in rails running on 1.9.3, as nil now throws method errors.
Run rake rails:update:bin to generate new binfiles for rails
Merge branch 'dev' into rails4

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
Votable to strong_parameters
Merge pull request #140 from codeflash/dev

Dev
Update db schema because Rails 4 makes the syntax awesomer (syntax changes only)
Merge pull request #149 from codeflash/dev

Dev
updated the validation of problem shortame. can be lowercase numbers and dashes
profile has a language now
Merge branch 'hotfix/languages' into dev
Update Gemfile.lock
Merge branch 'master' into rails4

Conflicts:
	Gemfile.lock
	app/models/concerns/comment.rb
	app/models/concerns/votable.rb
	app/models/solution.rb
	config/environments/production.rb
	db/schema.rb
Merge branch 'dev' into rails4

Conflicts:
	Gemfile.lock
Update Gemfile.lock
added points method to profile
Update dependencies
updated db schema
fixed the solution edit test
Put db:reset into travis script