Merge pull request #1 from OHI-Science/master

getting latest
with @bbest, removing redundant and debug code in MAR
Merge pull request #2 from OHI-Science/master

time to get NP fixes and initial ohi2014 run
some changes with @bbest during Tbx learning session
trying to debug NP
trying to debug NP mismatches
Merge pull request #15 from jules32/master

trying to debug NP