htpasswd support with new gemfile, update WP trunk, etc