Merge pull request #12 from esteinborn/master

Master to Craig
Title changes
Grunt, theme change
Merge pull request #13 from esteinborn/Craig

Craig