Add license to package.json
Merge pull request #2016 from bootstraponline/master

Add license to package.json
show extra server params in logs for easier debugging
Merge pull request #2017 from jlipps/master

show extra server params in logs for easier debugging
add enablePerformanceLogging cap for chrome/android hybrid, so we can get performance logs
Use new version of Device.configureLocalApp
Merge pull request #2018 from jlipps/master

add enablePerformanceLogging cap for chrome/android hybrid
Merge pull request #2019 from imurchie/isaac-iosconfig

Use new version of Device.configureLocalApp
add --command-timeout server arg
so the server can set its own default timeout.
also, clean up some of the command timeout logic
Merge pull request #2020 from jlipps/master

add --command-timeout server arg
store --command-timeout as int