Make git ignore vagrant

Move Vagrantfile to Vagrantfile.template
Add Vagrantfile and .vagrant to gitignore
Merge branch 'develop' of github.com:akvo/akvo-rsr into develop