added another deployment folder
updating configs
fixes for the demo
Merge branch 'master' of https://github.com/fkleedorfer/aic2014