updated gruntfile
merged
updated specs