Merge remote-tracking branch 'marvin/master'

Conflicts:
	iminsigihumbi.py
Merge remote-tracking branch 'pivot/master'

Conflicts:
	iminsigihumbi.py
Merge branch 'master' of https://github.com/pivotaccess2007/iminsi-gihumbi
ui stuff

ui stuff
ui stuff

ui stuff
Merge branch 'master' of https://github.com/pivotaccess2007/iminsi-gihumbi
Merge branch 'master' of https://github.com/pivotaccess2007/iminsi-gihumbi
Merge branch 'master' of https://github.com/pivotaccess2007/iminsi-gihumbi
ui sutff

ui stuff
Merge remote-tracking branch 'marvin/master'
Coming up to date.
Transfers and failures.
Clean settings, no ectomorph confusion, et cetera.