Merge pull request #4 from adamlincoln/master

Move presentation stuff out of main template into mustache files