Updated with new var and cleaned up code

Removed spurious spaces; added wearAtLogin variable and setting;
added some macros.
Merge branch 'Development' of https://github.com/emmamei/cdkey into Development