Digital Ocean accidentally re-enabled
Merge branch 'master' into softlayer

Conflicts:
	src/Puphpet/MainBundle/Resources/views/front/sections/deploy-target.html.twig
Adds SL icons
Takes into account when ssh_username is root; #564
Installs curl by defualt; #564
Removes HDD option; all databases are lower case; #564
Adds domain and requires hostname; #564
Big warning in your face about failing $ vagrant up; #564