Delete integrating local tag before fetching remote tags
When testing create a upstream repository for tests
Replace tabs with spaces
Push 'integrating' tag to remote before 'rake integrate'
Merge branch 'master' into tb/fix-46

Conflicts:
	features/integration.feature
Merge pull request #48 from Helabs/tb/fix-46

Delete integrating local tag before fetching remote tags