Merge branch 'master' into kyle
Removal of some test text in a message.
Added check for valid API key before displaying options.
Initial work for inline help system.
Dashboard overhaul - now display parameters at request.
Merge branch 'kyle'