Merge pull request #13 from JackWReid/master

Removed prefixes for #10, ran grunt
Merge pull request #1 from Magmoz/master

Merge pull request #13 from JackWReid/master