changes to MS so that code works with data
Merge branch 'master' of github.com:rmaia/pavo
ms edit, large chunks of code removed