Updating to latest codebase

Now uses grunt!