Removing option forced 32bit build on Linux

Conflicts:
	CMakeLists.txt
Cleaning up and porting changes from ios branch into development