Changes from lapton
Merge branch 'master' of http://github.com/rydnr/gtd

Conflicts:
	todo.org