Miscelaneous edits
Merge branch 'master' of github.com:LuRsT/Setup