Merge pull request #2 from iloveitaly/master

Mass-assignment fixes, code cleanup
Merge pull request #2 from drefined/master

Mass-assignment fixes, code cleanup
fix undefined Spree::MailMethod.current breaking tests

when Spree::MailMethod.current is used at the class level, it breaks the whole app when it is not
yet defined, including tests. We only have one mail method so no real need to set defaults
bump to 1.0.2
change the dependency in the gem so bundler does not complain
Merge git://github.com/greendog/spree_contact_us

Conflicts:
	app/mailers/spree/inquiry_mailer.rb
Merge git://github.com/codeodor/spree_contact_us
normalize mailer BCC logic now that #1806 is fixed
get tests working with a couple simple controller tests

need placeholder assets for .js and .css files, per Radar
fixup spec_helper and Rakefile to match more current extensions
add test for recaptcha verification, refactor accordingly
add simple honeypot CAPTCHA, with normal flash message
shoulda-matchers explicity needed in Gemfile for workaround
add tests for Spree::Inquiry and the mailer
add template for confirmation email, with partial for footer
add translations for new confirmation mail bits
add notification template and partial for shared details, with xlation
add remote_ip and http_user_agent to inquiries and notification emails

to help with tracking logs and reported issues by browser type
show remote_ip and user_agent in admin
split up controller spec a little
add honeypot captcha settings fields to admin, and organize