Better .tox dir ignore
Merge branch 'master' of https://github.com/CGenie/vagrant-fuel-dev

Conflicts:
	Vagrantfile