Don't update apt index in specs (done in provision.pp)
Merge pull request #184 from njam/issue-184

Should apt-get update before php5 installation
Merge branch 'master' of github.com:cargomedia/puppet-packages into issue-307

Conflicts:
	modules/base/spec/tools/manifest.pp