Properly distinguish between 'proper' and 'computed' constants (closes #190).
Minor cleaning up.
New snapshots.
Merge branch 'master' of git+ssh://github.com/opencor/opencor

Conflicts:
	src/plugins/misc/CellMLSupport/src/cellmlfileruntime.cpp