Merge branch 'release/0.4'
Update README.md
Merge branch 'release/0.5'
Merge branch 'master' of https://github.com/pivotalservices/bosh-lite-install
Fixing the traps and their location
Merge branch 'hotfix/BUG_TRAPS' into develop