Bunch of additional configs. Fixes #1 (yay first issue resolved)
Merge remote-tracking branch 'origin/master'