add --show-config flag to show appium config, and include server build time
Merge pull request #1591 from jlipps/master

add --show-config flag to show appium config, and include server build t...
make sure --show-config doesn't crash main server :-)
allow user to let instruments launch device with --default-device
Merge pull request #1592 from jlipps/master

allow user to let instruments launch device with --default-device
update sauce android example to not be dependent on driverblock
Merge pull request #1593 from jlipps/master

update sauce android example to not be dependent on driverblock
we don't write to authfile anymore, so get rid of that code
and give users the ability to give total and insecure access to taskport
Merge pull request #1594 from jlipps/master

we don't write to authfile anymore, so get rid of that code
Add class name as a valid strategy for non-Web platforms
Merge pull request #1596 from mobiware/master

Fix for #1595
Setting newCommandTimeout capability to 0 disables timeout.
Merge pull request #1598 from haveahennessy/disable-timeout

Setting newCommandTimeout capability to 0 disables timeout.
add lots more tests for command timeout
testing setting via desired caps as well
also, make it so passing in 'false' also disables timeout
Pipe force quit logs to console

info: [ForceQuitUnresponsiveApps] 2013-12-10 15:11:16.424 ForceQuitUnresponsiveApps[56799:507] Force quit unresponsive instruments v0.0.1
info: [ForceQuitUnresponsiveApps] 2013-12-10 15:11:42.708 ForceQuitUnresponsiveApps[56799:507] Force quitting: 'freeze2' at 'file:///Users/user/ForceQuitUnresponsiveApps/freeze2/./bin/freeze2.app/Contents/MacOS/instruments'
Merge pull request #1601 from jlipps/master

add lots more tests for command timeout
Merge pull request #1602 from bootstraponline/master

Pipe force quit logs to console
refactor server/main
and add --merciful flag to avoid the force quit instruments watcher
make sure we don't start FQInstruments on non-mac or mac < 10.9 (fix #1585)
Merge pull request #1603 from jlipps/master

refactor server/main and fix force-kill instruments issues