More changes made by silvia
Merge branch 'master' of https://github.com/slomascolo/NCEAS-RENCI_2014
yet more changes made by silvia