Updated requirements, deleting old things, updated dotcloud ch4 setup