Use index.md instead of index.html

Use excerpt
auto and server options are deprecated
merge
merge
conflict handle
merge with simao's
fix
merge with master