[20171007002353] Bug Fixes

[ddollar]

• #2102 Add support for CONVOX_WAIT to resource creation [@SonOfBytes]
• #2305 default api memory to 256 [@ddollar]
• #2307 Change CLI app discovery to include underscores [@jontonsoup]
• #2308 template updates [@ddollar]