chore(package.json): update to protractor 1.1.1

Author: petebacondarwin

package.json

@@ -7,7 +7,7 @@
   "license": "MIT",
   "devDependencies": {
     "karma": "~0.10",
-    "protractor": "~0.20.1",
+    "protractor": "^1.1.1",
     "http-server": "^0.6.1",
     "bower": "^1.3.1",
     "shelljs": "^0.2.6",
@@ -27,7 +27,7 @@
     "update-webdriver": "webdriver-manager update",
 
     "preprotractor": "npm run update-webdriver",
-    "protractor": "protractor e2e-tests/protractor-conf.js",
+    "protractor": "protractor e2e-tests/protractor.conf.js",
 
     "update-index-async": "node -e \"require('shelljs/global'); sed('-i', /\\/\\/@@NG_LOADER_START@@[\\s\\S]*\\/\\/@@NG_LOADER_END@@/, '//@@NG_LOADER_START@@\\n' + cat('app/bower_components/angular-loader/angular-loader.min.js') + '\\n//@@NG_LOADER_END@@', 'app/index-async.html');\""
   }