Added Helios (from Heroku) and Windows Azure