Revert "hopefully fix travis testing"
Revert "hopefully fix travis testing"

This reverts commit 5a25bb25d4add58f381ef4878457580955ff24c4.

Conflicts:
	.travis.yml

kimihito/loomio,labhackercd/loomio,digideskio/loomio,annewchen/loomio,loomio/loomio,aca13jmf/loomio,mlarghydracept/loomio,wangjun/loomio,doomergithub/loomio,sicambria/loomio,isomerase/loomio,mhjb/loomio,juliagra/loomio,mlarghydracept/loomio,doomergithub/loomio,gvalerin/loomio,sicambria/loomio,mhjb/loomio,codingnutty/loomio,annewchen/loomio,gvalerin/loomio,doomergithub/loomio,piratas-ar/loomio,tachyons/loomio,juliagra/DBCloomio,mlarghydracept/loomio,gvalerin/loomio,Collabforge/site-collabio,HadoDokis/loomio,digideskio/loomio,tachyons/loomio,FSFTN/Loomio,FSFTN/Loomio,isomerase/loomio,FSFTN/Loomio,kimihito/loomio,codingnutty/loomio,Collabforge/site-collabio,isomerase/loomio,digideskio/loomio,piratas-ar/loomio,wangjun/loomio,aca13jmf/loomio,labhackercd/loomio,tachyons/loomio,juliagra/loomio,labhackercd/loomio,annewchen/loomio,Collabforge/site-collabio,sicambria/loomio,tachyons/loomio,piratas-ar/loomio,HadoDokis/loomio,kimihito/loomio,sicambria/loomio,FSFTN/Loomio,aca13jmf/loomio,Collabforge/site-collabio,loomio/loomio,HadoDokis/loomio,loomio/loomio,mhjb/loomio,mhjb/loomio,labhackercd/loomio,juliagra/DBCloomio,HadoDokis/loomio,piratas-ar/loomio,wangjun/loomio,loomio/loomio,juliagra/DBCloomio,codingnutty/loomio,juliagra/loomio,isomerase/loomio