code cleanup

-user proper method for checking null
-reduce line length to 80 chars
CC-5013:
Re-Added watched folder wont update

-fixed
Merge branch 'master' of dev.sourcefabric.org:airtime