Merge pull request #301 from SethTisue/re-add-browse

re-add browse to 2.12 build

Author: SethTisue

common.conf

@@ -20,7 +20,7 @@ vars: {
   scala-xml-version                : ${?scala_xml_version}
 
   // TODO: merge required changes upstream to get rid of our forks, maintaining our one won't scale
-  browse-ref                   : "SethTisue/browse.git#topic/2.11-compat"
+  browse-ref                   : "SethTisue/browse.git#topic/2.12-compat"
   lift-framework-ref           : "lift/framework.git#3.0-M2-release"
   spray-ref                    : "spray/spray.git#v1.3.3"
   // only building project twirl-api, fixed sha from master branch that has Scala 2.11 compatibility patches merged
@@ -395,14 +395,10 @@ build += {
     extra.projects: ["sbt-testng-interface"]  // just the interface, we don't need to build the plugin
   }
 
-//  ${vars.base} {
-//    name:   "browse"
-//    uri:    "https://github.com/"${vars.browse-ref}
-//    extra.commands: ${vars.default-commands} [
-//      "set libraryDependencies += \"org.scala-lang.modules\" %% \"scala-xml\" % \"1.0.0-RC6\""
-//    ]
-//    extra.exclude: ["test", "testLink"]
-//  }
+ ${vars.base} {
+   name:   "browse"
+   uri:    "https://github.com/"${vars.browse-ref}
+ }
 
   ${vars.base} {
     name: sbinary