Updates to templates, start economic
Add economic index
Some improvements to templates, getting started on economic.
Fix conflicts
Merge pull request #15 from hampelm/gh-pages

economic + template update