increase make init timeout for vagrant

don’t know why it sometimes takes longer than 60 seconds
but I figure it doesn’t hurt to wait a bit
use devel branch for now while debugging deploys
for CloudFormation deploy, need .lock file

FYI: local deploy works without it
so never noticed that this was out of date
Merge pull request #434 from ultrasaurus/devel-chef-improvements

improvements for vagrant & automated deployment