Move copy of Kibana dashboard into puppet file and add a puppet fileserver config for puppet:/// pathes
Merge branch 'master' of github.com:christofmuc/birdminer

Conflicts:
	birdwatcher/postVagrantUp.sh
Cleanup the merge