moved tests, and modified travis to use miniconda
merged travis