Updated version number; consolidated multiple version number references; updated mechansims for setting version number