merging
Merge branch 'master' of https://github.com/mavroskardia/mustache2013
Merge branch 'master' of https://github.com/mavroskardia/mustache2013