Fixed plugins and started to add grunt