Build matrix
Merge branch 'matrix' of github.com:rmcgibbo/mdtraj into matrix
try this
stuff
stuff
2.6
New syntax
try to fix 2.6 build
nanmean is only in numpy==1.8
fix for numpy1.6
don't specify minor version
Fixed pandas 0.11 compat.
Merge pull request #468 from kyleabeauchamp/mymatrix

Fix for pandas 0.11
bump scipy version in netcdf to 0.12.0
merge master branch into matrix
change around requirements-conda files
conda
Merge pull request #466 from rmcgibbo/matrix

Build matrix