Rollback broken changes. Add travis-ci icon.