Simplifies Travis config - eliminates before_script entries.

New rake tasks.
Cleans up a couple of previous merging issues unrelated to the Travis fix.