Use $with array for also setting references
Added $includes var so it doesn't break default behaviour
Merge pull request #3 from delaetthomas/master

Use $includes array for settings references