General cleanup, renamed activities
Added travis config

Fully untested :P