Removed DEBUG statements
Removed debug statement and added display
Fixed makefile to build descramble_map correctly
Merge branch 'testing'
Merge branch 'testing'

Conflicts:
	data/cindata.c
	utils/cindump.c
Merge branch 'testing'
Merge branch 'testing'
Merge branch 'testing'
Merge branch 'testing'
Merge branch 'testing'
Changed vertical size
Moved files
Changed Makefiles to match new locations
Merge branch 'master' into testing