Added TODO list to user profile
Merge branch 'master' into permalinks
Merge branch 'master' into whitespace