Big ol’ bag o changes.
Merge branch 'master' of https://github.com/Make-Magazine/Mini-Maker-Faire-WordPress-Theme
Adding basic english translation. Need to create .POT file for a base translation template
Merge branch 'master' of https://github.com/Make-Magazine/Mini-Maker-Faire-WordPress-Theme