Merge branch 'develop' of https://github.com/ciderapp/Cider into develop

.circleci/config.yml

@@ -14,13 +14,13 @@ jobs:
       - restore_cache:
           name: Restore Yarn Package Cache
           keys:
-            - yarn-packages-{{ checksum "yarn.lock" }}
+            - yarn-packages-{{ checksum "cider-yarn.lock" }}
       - run:
           name: Install Dependencies
           command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
       - save_cache:
           name: Save Yarn Package Cache
-          key: yarn-packages-{{ checksum "yarn.lock" }}
+          key: yarn-packages-{{ checksum "cider-yarn.lock" }}
           paths:
             - ~/.cache/yarn
       - run:
@@ -34,15 +34,6 @@ jobs:
             sudo dpkg --add-architecture i386
             sudo apt-get update -y
             sudo apt-get install -y wine32
-      - run:
-          name: Start X VNC Server
-          command: x11vnc -forever -nopw -create
-          background: true
-            #- run:
-            #name: Base Functionality Testing
-            #command: yarn test
-      - store_test_results:
-          path: test-results
       - run:
           name: Append Commit BuildID to Version
           command: yarn circle:append-bid