Merge remote-tracking branch 'gmackie/master'
Merge remote-tracking branch 'euank/master'
Fix diagnostic messages
Add a shorter wolfram command
Merge pull request #23 from LinuxMercedes/master

Fix a few details with the wolframalpha module