Fixed up gruntfile and modified parser slightly