fixed test to run on travis, also using miniconda to setup the test environment
Merge remote-tracking branch 'origin/master'