Merge git://github.com/abzde/stirling into dev

Conflicts:
	multiverse/energy/__init__.py
Merge git://github.com/abzde/stirling into dev
Merge git://github.com/abzde/stirling into dev
Might work?
Time!?

(no but really, please don't use this commit, it doesn't do anything I'm
just committing to get it backed up somewhere before a reinstall.)
Update README.rst
Update __init__.py

More splash texts
Just a general cleanup of stuff, I guess.  These changes are from like a year ago.
Merge branch 'dev' of git://github.com/emsenn/stirling into dev
Merge branch 'dev' of github.com:emsenn/stirling into dev
Oh noes so many changes I don't even know what they are anymore.