Tools for sws2rst
Merge remote-tracking branch 'sagemath/master' into sws2rst
Trac 10637 reviewer patch

More accurate error message if BeautifulSoup is not installed
#12415: Fix some doctests in sagenb
Sanitize the output and text cells of published worksheets.
Add nofollow to html scrubbing.  Thanks to Volker Braun for bringing it up.
Don't scrub html twice.
Remove the remainder of the whatwg unsafe tags.

See https://groups.google.com/forum/?fromgroups=#!msg/sage-devel/ze5PZc1Wyjk/sjc-vkYbkUIJ for a discussion.
1024-bit rsa keys,  Darwin,  expiration_days

generate 1024-bit rsa keys,  
do not treat Darwin specially in this respect, as openssl is there anyway, 
decrease expiration_days to an acceptable period.
set recovery password via user_manager

Also set it only if sending the email succeeded, instead of setting it back to
the old value if that failed.
Modify code so we can remove the old notebook from Sage. See
http://trac.sagemath.org/sage_trac/ticket/11409.
Change "host" back to "interface"
Needed for the new doctester framework

See http://trac.sagemath.org/sage_trac/ticket/12415
Don't doctest the data dir
Revert "#12415: Fix some doctests in sagenb"

Jeroen says this is no longer necessary.

This reverts commit 23da3557b5440698802bd8db3f7e1611f6ebfd1c.
properly handle directories not ending in .sagenb
provide warning about URL when using openid
Merge branch 'master' into issue-98
Don't assume `whoami` exists

Solaris doesn't have a `whoami` command.
Merge pull request #139 from ppurka/openid-warning

provide warning about URL when using openid (fixes #122)