issue89: vagrant status is now displaying task_state if not null and otherwise vm_state
Merge branch 'issue89' of https://github.com/f2brossi/vagrant-openstack-provider into issue89

Conflicts:
	source/locales/en.yml