storage specific locks

Conflicts:
	recommends/tasks.py
fixing travis build
storage specific locks

Conflicts:
	recommends/tasks.py
try installing scipy binaries from ppa
use miniconda to install scipy
removed "sparse" installation
removed python2.6 testing
install condaenv
whitespace
Merge remote-tracking branch 'origin/travis' into develop

Conflicts:
	recommends/storages/base.py