Revert "Release v1.1 (#31)"

This reverts commit 0f562e5.

.gitignore

@@ -87,6 +87,3 @@ ENV/
 
 # Rope project settings
 .ropeproject
-
-media/
-static/

.travis.yml

@@ -4,24 +4,24 @@ language: python
 python:
   - "2.7"
 
-services:
-  - docker
+node_js:
+  - "5"
+  - "6"
 
 addons:
   postgresql: "9.4"
 
-before_cache:
+before_cache: 
   - rm -f $HOME/.cache/pip/log/debug.log
 
 before_script:
-  - psql -c "CREATE DATABASE cloudcv" -U postgres
-
+  - psql -c "CREATE DATABASE cloudcv" -U postgres 
+ 
 before_install:
   - pip install -U pip
   - nvm install 6.0.0
   - nvm use 6.0.0
   - npm install -g yarn@0.23.4
-  - openssl aes-256-cbc -K $encrypted_47cc4c169e78_key -iv $encrypted_47cc4c169e78_iv -in CloudCV.json.enc -out CloudCV.json -d
 
 install:
   - pip install -r requirements/dev.txt
@@ -30,20 +30,11 @@ install:
 
 script:
   - flake8 ./
-  - py.test --cov . --cov-config .coveragerc
   - cd frontend && npm run lint:build
   - npm run test
   - npm run build:alias
 
-after_success:
-  - cd ../
-  - coveralls --rcfile=.coveragerc
-  - pip install awscli
-  - bash scripts/stage.sh
-  - bash scripts/deploy.sh
-
 cache:
-  directories:
+  directories: 
     - frontend/node_modules
     - $HOME/.cache/pip
-

README.md

@@ -1,6 +1,6 @@
 # CloudCV
 
-[![Join the chat at https://gitter.im/Cloud-CV/Lobby](https://badges.gitter.im/Cloud-CV/Lobby.svg)](https://gitter.im/Cloud-CV/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)       [![Build Status](https://travis-ci.org/Cloud-CV/CloudCV.svg?branch=develop)](https://travis-ci.org/Cloud-CV/CloudCV)    [![Code Health](https://landscape.io/github/Cloud-CV/CloudCV/develop/landscape.svg?style=flat)](https://landscape.io/github/Cloud-CV/CloudCV/develop)    [![Coverage Status](https://coveralls.io/repos/github/Cloud-CV/CloudCV/badge.svg)](https://coveralls.io/github/Cloud-CV/CloudCV)
+[![Join the chat at https://gitter.im/Cloud-CV/Lobby](https://badges.gitter.im/Cloud-CV/Lobby.svg)](https://gitter.im/Cloud-CV/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)       [![Build Status](https://travis-ci.org/Cloud-CV/CloudCV.svg?branch=master)](https://travis-ci.org/Cloud-CV/CloudCV)    [![Code Health](https://landscape.io/github/Cloud-CV/CloudCV/master/landscape.svg?style=flat)](https://landscape.io/github/Cloud-CV/CloudCV/master)
 
 ## How to Setup
 
@@ -11,31 +11,27 @@
     ```
     git clone git@github.com:Cloud-CV/CloudCV.git cloudcv
     ```
-    If you have not added `ssh` keys to your GitHub account then get the source code by running the following command
-    ```
-    git clone https://github.com/Cloud-CV/CloudCV.git cloudcv
-    ```
 3. Create a python virtual environment and install python dependencies.
     ```
     cd cloudcv
     virtualenv venv
     source venv/bin/activate  # run this command everytime before working on project
     pip install -r requirements/dev.txt
     ```
-4. Rename `settings/dev/settings.sample.py` as `settings/dev/settings.py` and change credentials in `settings/dev/settings.py`
+4. Rename `settings/dev.sample.py` as `dev.py` and change credential in `settings/dev.py`
     ```
-    cp settings/dev/settings.sample.py settings/dev/settings.py
+    cp settings/dev.sample.py settings/dev.py
     ```
-    Use your postgres username and password for fields `USER` and `PASSWORD` in `settings/dev/settings.py` file.
+    Use your postgres username and password for fields `USER` and `PASSWORD` in `dev.py` file.
 5. Create an empty postgres database and run database migration.
     ```
     sudo -i -u (username)
     createdb cloudcv
-    python manage.py migrate --settings=settings.dev.settings
+    python manage.py migrate --settings=settings.dev
     ```
 6. That's it. Now you can run development server at [http://127.0.0.1:8000](http://127.0.0.1:8000) (for serving backend)
     ```
-    python manage.py runserver --settings=settings.dev.settings
+    python manage.py runserver --settings=settings.dev
     ```
 7. Open a new terminal window with node(>=6) and ruby(gem) install on your machine and type
     ```
@@ -45,12 +41,12 @@
     ```
     If you running npm install behind a proxy server, use
     ```
-    npm config set proxy http://proxy:port
+    npm config set proxy http://proxy:port 
     ```
 8. Now to connect to dev server at [http://127.0.0.1:6003](http://127.0.0.1:6003) (for serving frontend)
     ```
     yarn run dev
     ```
 ## Contribution guidelines
 
-If you are interested in contributing to CloudCV, follow our [contribution guidelines](https://github.com/Cloud-CV/CloudCV/blob/master/.github/CONTRIBUTING.md).
+If you are interested in contributing to CloudCV, follow our [contribution guidelines](https://github.com/Cloud-CV/CloudCV/blob/master/.github/CONTRIBUTING.md).