Config changes
Merge branch 'master' of https://github.com/Eclipzed/marinestation24.git