updates
Merge branch 'master' of https://github.com/tkmharris/tom_personal

Conflicts:
	todo.txt