Merged in thorade/mako/thorade/usagerst-edited-online-with-bitbucket-re-1420640941130 (pull request #13)

usage.rst edited online with Bitbucket,