add conf.py.sample display

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
slug support in link:// magic URLs
Merge branch 'master' of github.com:getnikola/nikola
prettify conf.py.sample output with pygments

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
pytz has a sane version number now

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
fixes #794

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
flake8

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
switched back to lepture's python-livereload because he fixed it
trivial changes in setupy.py
marked everything as 6.1.0
Merge branch 'master' of github.com:getnikola/nikola
mark as 6.1.0
merged master