Revert "attempt to make travis happy" [ci skip]
Revert "attempt to make travis happy" [ci skip]

This reverts commit 8507dc864fa19b29a93b3357e32f59bbf376eae2.

spixi/diaspora,KentShikama/diaspora,SuperTux88/diaspora,despora/diaspora,Flaburgan/diaspora,jhass/diaspora,Amadren/diaspora,Amadren/diaspora,spixi/diaspora,Muhannes/diaspora,KentShikama/diaspora,spixi/diaspora,KentShikama/diaspora,SuperTux88/diaspora,Muhannes/diaspora,SuperTux88/diaspora,Amadren/diaspora,spixi/diaspora,diaspora/diaspora,Flaburgan/diaspora,diaspora/diaspora,jhass/diaspora,KentShikama/diaspora,geraspora/diaspora,geraspora/diaspora,despora/diaspora,despora/diaspora,Flaburgan/diaspora,geraspora/diaspora,Flaburgan/diaspora,despora/diaspora,SuperTux88/diaspora,diaspora/diaspora,Muhannes/diaspora,jhass/diaspora,diaspora/diaspora,Muhannes/diaspora,jhass/diaspora,geraspora/diaspora,Amadren/diaspora