Merge pull request #1 from nubs/master

Initial commit.
Change to flatly theme and update to 3.1.1.