Merge branch 'master' into tojava3

Conflicts:
	pom.xml
	src/main/scala/com/twitter/joauth/OAuthParams.scala
	src/test/scala/com/twitter/joauth/OAuth1ParamsSpec.scala
	src/test/scala/com/twitter/joauth/UnpackerSpec.scala
	src/test/scala/com/twitter/joauth/testhelpers/ParamHelper.scala