Tidied up configuration and environment in fabfile