Merge pull request #49 from michaelnsj/3.0

Merged
Merge pull request #50 from michaelnsj/3.0

Merged.
Merge pull request #51 from michaelnsj/3.0

Merged
update service ref
Merge pull request #52 from michaelnsj/3.0

Merged.
re-enable vcap_shotdown
Merge branch '3.0' of github.com:intalio/vcap into 3.0
set es max memory to 1024
update service