Working on travis, getting rid of stuff that breaks on multiple grunt runs