changes to make it work on paris
more changes to run on paris
Merge branch 'polish-code' into polish-code-paris

Conflicts:
	usui/task_queue/tasks.py
making sure everything works on paris
Merge branch 'polish-code' into polish-code-paris

Conflicts:
	app/scripts/controllers/models.js
	app/scripts/controllers/results.js
	app/scripts/controllers/tables.js
	app/views/samplerecs.html
Merge branch 'polish-code' into polish-code-paris
symlink for bayarea.h5
Merge branch 'polish-code-paris' of https://github.com/synthicity/usui into polish-code-paris
Merge branch 'polish-code' into polish-code-paris
Merge branch 'new-data-infrastructure' into paris-development

Conflicts:
	app/views/samplerecs.html
	usui/server.py
Merge branch 'new-data-infrastructure' into paris-development

Conflicts:
	app/scripts/services/server.js
merge file from new-data-infrastructure
Merge branch 'new-data-infrastructure' into paris-development
various fixes
improve ace editor style