#2006 set short keepalive interval for XMPP
Added ability to force use of flashlight from command-line
Merge pull request #2036 from getlantern/2006

set short keepalive interval for XMPP, closes #2006
Merge pull request #2037 from getlantern/forceflashlight

Added ability to force use of flashlight from command-line