Merge pull request #56 from kwhitley/master

Adds files.html to template-generating watch task
Upgrade to angular 1.0.4