Merge PalEON 2014 branch

Code for parameter and state assimilation. Big because this is based off the stable 1.3.6 VM which had been releases and used in the course.