Merge pull request #37 from martindale/sources

Implement Basic non-Datastored Data
Merge branch 'master' of github.com:martindale/maki
Merge branch 'master' into maki.ericmartindale.com