Merge pull request #5 from nebula/nebulaUpdate

Merge with upstream
Merge branch 'master' of github.com:nebula/packer into generic-builder
prepared for new api builder