add todo
Update TODO.txt
add ssh-add command
add .xprofile
Merge branch 'master' into 13.04

Conflicts:
	ubuntu-setup.sh