py.test
test import from future fix
initial travis ci support
Merge pull request #1 from timtammittee/master

Change the unit notation for axis labels from [unit] to (unit)
travis self install fix
scipy as dependency
travis: apt-get numpy/scipy
travis pandas fix
travis apt-get update
Merge branch 'master' of github.com:mrkrd/thorns

Conflicts:
	tests/test_map.py
apt-get install pandas
remove apt-gets
apt-get libblas
apt-get liblapack