Bring changes from master

[rahulporuri]

Specifically, fixes for #35 and #33

The process of building and testing was :

• Install sphinx and enthought_sphinx_theme in an edm environment
• Run python -m sphinx docs\source docs\html
• Manually check using a http server - python -m http.server (from python 3.6 edm env) from docs\html directory
• Move/copy contents of docs\html to root directory. The only two files in the docs\html directory which weren't copied over to the root directory on this branch (gh-pages) are .buildinfo and .doctrees.
• Manually check using a http server - python -m http.server (from python 3.6 edm env) from root directory

fixes #36

[kitchoi]

LGTM