Bump to 0.6.0
Merge pull request #1628 from dotcloud/bump_0.6.0

Bump to 0.6.0
Merged 0.6.0 release back to master