Complete development for support of the "use_directory_urls" parameter,
so that it is now correctly respected when performing a static build.
Add unit test test_url_path_nodir to test the  test_url_path method
for the use_directory_urls=False case.
Replace old "use_directory_urls" config option with new "url_format".

Replace the old `use_directory_urls` boolean flag with a tri-state
option `url_format` which may be `directory`/`index` or `file`.  This
has the following effect:

    dir/file.md

Will be mapped to the following URL:
* [directory] -> `/dir/file/`
* [index] -> `/dir/file/index.html`
* [file] -> `/dir/file.html`

To retain backwards compatibility, the default is `directory` which is
the same behavior as the old default `use_directory_urls` = `True`.

This is respected under "serve" and "build" modes.  I have also updated
the unit tests and the Configuration section in the User Guide.
Fix errors and warnings in the travis-ci build related to indentation and whitespace in python files.
Remove stray debug line.
merged
fixed merge problems
Merge branch 'the-jxc-format_url' into feature/format-url-option

Merged url_format branch