Merge pull request #4 from tgstation/master

update from root fork
Merge pull request #5 from tgstation/master

merging tgstation/master over
change log for #3215
Merge pull request #3269 from MrStonedOne/silicon-macros-and-hotkeys-changelog

Silicon macros and hotkeys changelog (PR #3215)