Merge branch 'dev' into agent-master

CHANGELOG.md

@@ -2,26 +2,6 @@
 
 This file documents all notable changes to Falco. The release numbering uses [semantic versioning](http://semver.org).
 
-## v0.6.1
-
-Released 2016-05-15
-
-### Major Changes
-
-None
-
-### Minor Changes
-
-* Small changes to token bucket used to throttle falco events [[#234](https://github.com/draios/falco/pull/234)]] [[#235](https://github.com/draios/falco/pull/235)]] [[#236](https://github.com/draios/falco/pull/236)]] [[#238](https://github.com/draios/falco/pull/238)]]
-
-### Bug Fixes
-
-* Update the falco driver to work with kernel 4.11 [[#829](https://github.com/draios/sysdig/pull/829)]
-
-### Rule Changes
-
-* Don't allow apache2 to spawn shells in containers [[#231](https://github.com/draios/falco/issues/231)] [[#232](https://github.com/draios/falco/pull/232)]
-
 ## v0.6.0
 
 Released 2016-03-29

README.md

@@ -2,7 +2,7 @@
 
 #### Latest release
 
-**v0.6.1**
+**v0.6.0**
 Read the [change log](https://github.com/draios/falco/blob/dev/CHANGELOG.md)
 
 Dev Branch: [![Build Status](https://travis-ci.org/draios/falco.svg?branch=dev)](https://travis-ci.org/draios/falco)<br />