removed dotcloud branding
Merge branch 'shipyard'