Merge branch 'master' into site
diff --git a/.travis.yml b/.travis.yml
index 8cb390e..ed56152 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,6 @@
   only:
     - master
     - /^branch\-.*$/
-    - /^feature\/.*$/
 
 script: mvn test -P $PROFILE -Dsurefire.redirectTestOutputToFile=false -Dtwill.zk.server.localhost=false
 
diff --git a/README b/README.md
similarity index 69%
rename from README
rename to README.md
index 5f64cdc..d78c443 100644
--- a/README
+++ b/README.md
@@ -1,3 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
 What is Apache Twill?
 ---------------------
 Twill is an abstraction over Apache Hadoop® YARN that reduces the complexity 
@@ -10,9 +28,11 @@
 ---------------
 You can build and install the Apache Twill by:
 
+```sh
     git clone https://git-wip-us.apache.org/repos/asf/incubator-twill.git
     cd incubator-twill
     mvn install
+```
 
 After the maven installation completes, you can include the artifact 
 org.apache.twill:twill-yarn as a dependency on your other projects.
@@ -40,5 +60,5 @@
 
 Apache Twill uses the built-in java cryptography libraries for unique ID
 generation. See 
-http://www.oracle.com/us/products/export/export-regulations-345813.html
+<http://www.oracle.com/us/products/export/export-regulations-345813.html>
 for more details on Java's cryptography features.
diff --git a/twill-api/pom.xml b/twill-api/pom.xml
index ee34b84..da7b50e 100644
--- a/twill-api/pom.xml
+++ b/twill-api/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.twill</groupId>
         <artifactId>twill-parent</artifactId>
-        <version>0.8.0-incubating-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>twill-api</artifactId>
diff --git a/twill-common/pom.xml b/twill-common/pom.xml
index cd25620..927d70b 100644
--- a/twill-common/pom.xml
+++ b/twill-common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>twill-parent</artifactId>
         <groupId>org.apache.twill</groupId>
-        <version>0.8.0-incubating-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/twill-core/pom.xml b/twill-core/pom.xml
index 88212ec..6c3d878 100644
--- a/twill-core/pom.xml
+++ b/twill-core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>twill-parent</artifactId>
         <groupId>org.apache.twill</groupId>
-        <version>0.8.0-incubating-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/twill-discovery-api/pom.xml b/twill-discovery-api/pom.xml
index a7723d5..5d183ea 100644
--- a/twill-discovery-api/pom.xml
+++ b/twill-discovery-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>twill-parent</artifactId>
         <groupId>org.apache.twill</groupId>
-        <version>0.8.0-incubating-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/twill-discovery-core/pom.xml b/twill-discovery-core/pom.xml
index 4264ef1..f2ba227 100644
--- a/twill-discovery-core/pom.xml
+++ b/twill-discovery-core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>twill-parent</artifactId>
         <groupId>org.apache.twill</groupId>
-        <version>0.8.0-incubating-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/twill-examples/echo/pom.xml b/twill-examples/echo/pom.xml
index 6893236..fe690f6 100644
--- a/twill-examples/echo/pom.xml
+++ b/twill-examples/echo/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>twill-examples</artifactId>
         <groupId>org.apache.twill</groupId>
-        <version>0.8.0-incubating-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
     </parent>
 
     <name>Apache Twill examples: Echo</name>
diff --git a/twill-examples/pom.xml b/twill-examples/pom.xml
index 0550876..d466f95 100644
--- a/twill-examples/pom.xml
+++ b/twill-examples/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.twill</groupId>
         <artifactId>twill-parent</artifactId>
-        <version>0.8.0-incubating-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>twill-examples</artifactId>
diff --git a/twill-examples/yarn/pom.xml b/twill-examples/yarn/pom.xml
index 58d4b99..0777c71 100644
--- a/twill-examples/yarn/pom.xml
+++ b/twill-examples/yarn/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>twill-examples</artifactId>
         <groupId>org.apache.twill</groupId>
-        <version>0.8.0-incubating-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
     </parent>
 
     <name>Apache Twill examples: YARN</name>
diff --git a/twill-ext/pom.xml b/twill-ext/pom.xml
index c5bab6c..80dc8e6 100644
--- a/twill-ext/pom.xml
+++ b/twill-ext/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>twill-parent</artifactId>
         <groupId>org.apache.twill</groupId>
-        <version>0.8.0-incubating-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/twill-java8-test/pom.xml b/twill-java8-test/pom.xml
index fc8ccae..1492c60 100644
--- a/twill-java8-test/pom.xml
+++ b/twill-java8-test/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.twill</groupId>
         <artifactId>twill-parent</artifactId>
-        <version>0.8.0-incubating-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>twill-java8-test</artifactId>
diff --git a/twill-yarn/pom.xml b/twill-yarn/pom.xml
index acfacaa..5b4ca18 100644
--- a/twill-yarn/pom.xml
+++ b/twill-yarn/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>twill-parent</artifactId>
         <groupId>org.apache.twill</groupId>
-        <version>0.8.0-incubating-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/twill-zookeeper/pom.xml b/twill-zookeeper/pom.xml
index 2f680f7..45178a9 100644
--- a/twill-zookeeper/pom.xml
+++ b/twill-zookeeper/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>twill-parent</artifactId>
         <groupId>org.apache.twill</groupId>
-        <version>0.8.0-incubating-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>