In Progress.
X11 is still default pending SDL updates
Improved cmake options for SDL & X11
Merge branch 'master' into raswork
SDL on OSX works. Hope i didn't break it on linux.
Fixed bug in X11 graphics
Fixed signed/unsigned compare
Switched citizens to track their security instead of their picture
Added spontaneous internal security reviews
Update README.md
Added clock
Merge branch 'master' of github.com:ras0219/alphacomplex
Added simple animations via unsigned int animtime
Removed extern references to global city
Added uids for citizens
Merge remote-tracking branch 'jnstw/objectify' into jnstwpull
Removed City& argument to make_garbage_job
Make it compile on Visual Studio 2013
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/citizen.cpp
	src/entity.cpp
fix build post-merge