Add missing options and cleanup the code a bit. Default to by-slot ranking if a non-hardware option isn't given. Thanks to Tetsuya Mishima for the assist.

cmr=v1.7.5:reviewer=ompi-gk1.7