Cleaned-up system info.
Some other minor improvements.
Merge remote-tracking branch 'upstream/refactor' into refactor

Conflicts:
	plugins/system_info.py
	templates/plugins/system_info.html
Small API fix