changes needed for inital compilation and sync with astrid.com
Merge pull request #1 from shaded2/import_attempt

changes needed for inital compilation and sync with astrid.com