Fix specs

Minor tweaks. The major one here is disabling Bullet on Travis CI. There
seems to be some weird bad interaction between test ordering and
`current_user.country.name` that causes intermittent n+1 errors. I'd
really like to figure out a better solution to this one.