initial commit, yes i know it's a crappy message
fix merge
Remove CloudFoundry for now