reorder systray menu items as per new design

mcnair: there is a drop down list that elijah and i worked on it looks like this. https://we.riseup.net/leap+client/ui-rev-b#task-tray-icon-and-menu

Logged in menu: Encrypted Internet: ON Turn Off -- Preferences Status Help -- Log out Quit

Logged out menu: Encrypted Internet: ON Turn Off -- [Preferences...] [Status...] Help -- Log in Quit

(from redmine: created on 2013-06-18, closed on 2013-07-02)