Updated to new waf version; implemented new tray icon