Moved conf.py

Also added optional (and better) theme by Ignacy Sokolowski
(https://github.com/ignacysokolowski/sphinx-readable-theme)
Fixed merge conflict in makefile
Added proper Date header by default