Merge branch 'data' of https://github.com/ne0phyte/GettingThingsDone
Merge branch 'master' of https://github.com/ne0phyte/GettingThingsDone into gui