added collectd template
Merge origin/master

Conflicts:
	src/vagrantbuilder.pyc