Merged creaktive/master : More concise ioreg arguments

Conflicts:
	battery
Merge branch 'concise-ioreg'