Merge pull request #12 from adelq/develop

Merge in latest development changes
Merge pull request #13 from adelq/develop

Major refactor of templates
Merge pull request #14 from adelq/develop

Basic templating
Merge pull request #15 from adelq/develop

Merge develop into master
Upgrade to Meteor 0.9.1