Add force option to reboot command
Merge remote-tracking branch 'Meatballs1/reboot_force2'
Whitespace fixup