Removed emoncms and its config files. Made some further refinements to scripts. Requires a vagrant destroy/vagrant up (sorry).
Merge branch 'master' of github.com:ForSpareParts/smarthub

Conflicts:
	server_config/vagrant/emoncms/settings.php