grunt passes
Merge pull request #7 from jchris/master

grunt passes