.travis.yml fixes

 * Reorder travis dependencies to group related packages better
 * Actually name the correct mock package