Fixed up gruntfile and modified parser slightly
Merge pull request #18 from darcyclarke/develop

Fixed up gruntfile and modified parser slightly