Syncing with Dev
Derp!
Refactor files for a more sane and less volatile directory layout
Shuffling data around, adding config defaults and updating .gitignore