Merge branch 'todo-devel' into todo
make the deploy script default to dry-run, must now use --really to deploy
Merge branch 'todo' into todo-devel