Update Gruntfile.js

Add missing comma
Merge pull request #4 from shukbot/2_postgres_adapter

using sails-postgres adapter
Resolve merge conflict to pull home view
Resolve merge conflicts to merge sign in branch
Generate an Inspiration Model and Controller that represents the text that a user will share.
Wow wow wow we got our database working
Add Backbone Views
working backbone views
working backbone views
move partial to show.ejs
some edits to backbone views
Merge pull request #17 from shukbot/InspirationModel

Inspiration model - approved by all team members during daily review
Grab current user id and save to database for new inspiration
Set user id and done status for added inspiration
Add ability for user to say an inspiral inspires them and adds it to their todo.
updates to home page and user show
Merge pull request #19 from shukbot/Store-Inspiration-Info

Store inspiration info
resolve merge conflict
Remove city from the API request for the time being
still resolving merge conflicts