Merge master 64 bit changes, SConstruct updates, API changes, GUI