Tweaks to grunt file and adding server