update colvars code to git version as of 2013-12-16