Added timeout option, moved password var

Includes changes by bukkitdev user ldrrp.