Merge branch 'master' into rails_4

Conflicts:
	.travis.yml
	lib/simple_form.rb
	lib/simple_form/form_builder.rb