add Vagrantfile to .gitignore
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	vagrant/elasticsearch.sh
Merge branch 'develop' into elasticsearch

Conflicts:
	vagrant/elasticsearch.sh
remove vagrant