Added grunt and fixed some stuff in js