Merge pull request #9 from yagince/develop

Develop
Merge pull request #11 from yagince/develop

Develop
Merge pull request #13 from yagince/develop

Develop
fix a missing comma in Guardfile
Merge pull request #14 from koko-u/missing_comma

you might miss comma in Guardfile template