major reorganization
Merge branch 'master' of http://github.com/chuck1/galaxy

Conflicts:
	Makefile
	cmake_install.cmake
	install_manifest.txt
	test_map
	test_sig
	test_timer