Better error if update fails when lock is out of sync
Issue #236 Puppetfile created by init should point to forge.puppetlabs.com
Merge branch 'master' into 1.0.x