Cleanup and remove dupicated code
Merge branch 'taskwarrior' of github.com:azapps/mirakel-android into taskwarrior