Merge conflict fixes caused by unintentional merges

• Merge branch 'master' into deploy da71c28
• Merge pull request #20 from browserstack/merge-conflict-fix a065f0b
• resolving merge conflict 9a22e31

v1.1.4...v1.1.5

Documentation enhancements

• Merge branch 'master' of github.com:browserstack/browserstack-cypress-cli 2d97d7b
• Merge pull request #14 from browserstack/CYP_123_instrumentation 11a63ce
• Merge branch 'master' of github.com:browserstack/browserstack-cypress-cli into CYP_123_instrumentation 315c575
• Merge pull request #18 from Sreyanth/master 331011e
• Merge pull request #19 from browserstack/CYP_152_key_change fb6759f
• bump version in package.json and update endpoint in config 46410d9
• Remove references to NPM package installations for 1.1.3 release. 9cd9326
• Update the way we support NPM deps 26424ed
• fix user-agent bug 8053797
• remove unwanted usage of baseUrl 7e12e3e
• update user-agent e646ae7
• update keys in browserstack.json 5513ca6
• add user-agent while calling api 67dd517
• update options in help messages 8d9d4d3
• Deprecate customBuildName and project options. 234a45c
• Add disable usage reporting CLI flag details. Add $ for CLI commands to be consistent. b9794a7
• Add deprecated options to README ecf0e81
• Fix verbs and include the config option details. Will figure a better way later. 576c948
• Update README to include quick start, disable usage reporting and npm dependencies 2f6f73e
• Bug fix browserstack-cypress run without browserstack.json 7c1e681
• remove console.log from fileHelpers fc3d9c0
• log -> resolve/reject while build creation 4d37104
• fix disable-usage-reporting flag bug 3f61f91
• move api_deprecated code, change array to obj in response c1caee0
• resolve filelogger err and add retries 148f056
• resolve undefined error 0341668
• Update endpoint and payload 2f04bc2
• Adding required instrumentation b2d3a22

v1.1.2...v1.1.4