Merge branch 'master' of /tmp/yourule-esperanza/yourule into master

Benjamin Mako Hill || Want to submit a patch?