working on a near manual merge
adding some config files
Merge branch 'master' of github.com:ImaginaryDevelopment/config