Merge remote-tracking branch 'upstream/master' into centos6
Merge branch 'centos6' of github.com:puppetlabs/puppetlabs-training-bootstrap into centos6
Fix zip files created

- avoid zipping full directory path
Fix eth interface numbering

- remove 70-networking-rules
Fix URL for epel repo
Merge pull request #69 from casharma/bugfix/vm/fundamentals-updates

Bugfix/vm/fundamentals updates