Support rails 4
Merge branch 'master' into rails4

Conflicts:
	code42.gemspec