Tidy up, re-shuffle and JS Hint run
Add role to popup
Split out more dialogue code, focus winner when opened
Merge branch 'master' into Metro-Mario