Same bookmarks in HTML export format
Attempt to fix failures in elpy-refactor by raising timeout value.
Added spinx-doc; cleaned up comments
Merge branch 'master' -- updates from other home