general clean up and adds a better example using both a component and a template out of the box
Merge branch 'master' of github.com:impossible-bureau/boilerplate

Conflicts:
	README.md