Merge pull request #2577 from dotcloud/bump_v0.6.6

Bump v0.6.6
Merge branch 'master' into bump_v0.6.7
Bump version to v0.6.7
Merge pull request #2812 from dotcloud/bump_v0.6.7

Bump v0.6.7