Merge pull request #1 from screamish/master

Some tiny fixes for safety
renamed spec to test.
moved files up.
Adding grunt.