Something PhpStorm did.
Created index file.
Updated Puppet modules.
Karma stuff.
Removed extra apt-get update.
No more apt-get update every provision.
Merge remote-tracking branch 'origin/master'

Conflicts:
	puppet/modules/bower/manifests/init.pp