JOJ16: Add ancils and extra parameters
Remove user_land_cover testing index
Merge remote-tracking branch 'remotes/origin/JOJ-108'
Move job runner to new location
Move job runner to new location
Correct changes to production.ini during merge
Add watch data
Make dodc path correct for output data
Merge remote-tracking branch 'remotes/origin/master' into joj16
Merge remote-tracking branch 'remotes/origin/JOJ-57'
Merge remote-tracking branch 'origin/master'
Make dodc path correct for output data
Merge remote-tracking branch 'remotes/origin/joj16'
Try crowd client
Set config of ssl openers when not in pylons mode
Get import correct
Undo hard code of server url
Merge remote-tracking branch 'remotes/origin/JOJ-108'

Conflicts:
	majic/joj/controllers/model_run.py
Merge remote-tracking branch 'remotes/origin/JOJ-108'

Conflicts:
	majic/joj/controllers/model_run.py
Merge remote-tracking branch 'origin/master'