model stuff
"merging hoepfully"
Merge branch 'master' of https://github.com/slomascolo/NCEAS-RENCI_2014