(tnoodle)Merging in changes from gnehzr. I have no idea if this is going to preserve his commit history.
(git-tools) Added savepid to git-tools.
(git-tools) Added a pretty generic automagicserver.sh script to git-tools that will start up a server in a screen session, and keep it up to date with whatever git repo we're using.
(git-tools) We've gotta kill the whole process tree to kill the server.
(tnoodle)Fixed bug with rmtree(foo) where foo isn't a directory.
(tnoodle)Added preliminary watermark support. I'd like to style it some more.
(tnoodle)Merge commit 'cd7b17a1a0bf32bbf2c81d64d0559f0f48083f2e'
(tnoodle)bash isn't in the same place everywhere.
(tnoodle)Improved automagic server script to handle multiple subprojects for a given repo!
(tnoodle)Fixed cwd for RunAll.py.
(tnoodle)Gotta do an initial compile!
Merge commit '1403025258bc1d9571bc63c699029e2f891177a4'

Conflicts:
	git-tools/.gitignore