Fix syntax in Gruntfile.  Add angular-cookies
Remove karma, add topcoat, update adwitz personal site.
fetching now grabs clippings/recs for just the logged in user
Merge pull request #90 from michaelmunson1/queryFix

fetching now grabs clippings/recs for just the logged in user
Merge branch 'master' of https://github.com/michaelmunson1/caracol
Remove login landing from bookmarklet app.  Revise bookmarklet styling.
Add cloudapp to script
Sorting of clippings/recs working correctly.
Merge pull request #92 from michaelmunson1/queryFix

Sorting of clippings/recs working correctly.
Merge pull request #91 from michaelmunson1/larry

Larry
Bookmarklet redirects to either login or vote page.
Merge pull request #93 from michaelmunson1/larry

Bookmarklet redirects to either login or vote page.
fetching now grabs clippings/recs for just the logged in user
Remove login landing from bookmarklet app.  Revise bookmarklet styling.
Add cloudapp to script
Sorting of clippings/recs working correctly.
got rid of hotlinking
removed merge conflicts
fixed merge confilict
Merge branch 'landing' of https://github.com/michaelmunson1/caracol into landing

Conflicts:
	client/scripts/controllers/vote.js
	dist/bookmarklet/bookmarkletApp.js