incorporated changes from up-to-date shell extension, fixes #13, #14

Current changes from https://github.com/projecthamster/shell-extension merged into cinnamon-applet. This should fix compatibility issues with Mint 17.1