Merge pull request #3 from delaetthomas/master

Use $includes array for settings references
Fix code formatting