Merge pull request #134 from bpitman/master

Test explicit bintray settings

Author: bpitman

project/Bintray.scala

@@ -22,7 +22,7 @@ object Bintray {
     licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.txt")),
     credentials += Credentials("Artifactory Realm", "oss.jfrog.org", user, pass),
 
-    publishTo := {
+    publishTo in bintray := {
       if (isSnapshot.value)
         Some("OJO" at s"https://oss.jfrog.org/oss-snapshot-local;build.timestamp=${now}/")
       else