Merge branch 'feature/oathpit' into feature/buff-worms

 * Update MFR to install waterbutler with workaround for small file
   downloads.

Author: felliott