Modified the order of API docs page so that table of contents is always
at the top (following #880)
Reinstate the pip timeout
Shuffle some commands back to before_install
Merge pull request #1294 from blink1073/streamline-travis

Reinstate pip timeout in the Travis-CI build
Merge pull request #1277 from emmanuelle/api_layout

In API docs page, place table of contents at the top
Add subpixel-precision phase correlation function to feature module