robot links to root
Merge branch 'develop' of https://github.com/Make-Magazine/makerapp into develop

* 'develop' of https://github.com/Make-Magazine/makerapp:
  robot links to root
taking this out because the subnav has been rm'd for some reason
Added the user's notebooks

Google will recursively crawl.
a couple of improvements to the js, no functional changes at all
comment
Merge branch 'comments' into develop

* comments:
  getting comment results to return json data
  adding api controller
  adding routes and paths
  adding comment views
  adding to schema
  adding comments to post
  adding comments model and migrations
just the same code but done using the jquery methods, for their magics
some indentation, location of var declaration, updating of masonry layout while images are coming down
using the declared function rather than repeating this bit
since we set the placeholder image already in the template, we can just do the swapping here rather than double assign
Initial mandrill template

Untested.
Merge pull request #22 from Make-Magazine/projects_js_optimization

a couple of improvements to the js, no functional changes
Making search into projects

not really, but just syncing.
Adding fun routes
Roll this auth back when you get it
Merge branch 'develop' of https://github.com/Make-Magazine/makerapp into develop

* 'develop' of https://github.com/Make-Magazine/makerapp:
  Making search into projects
  since we set the placeholder image already in the template, we can just do the swapping here rather than double assign
  using the declared function rather than repeating this bit
  some indentation, location of var declaration, updating of masonry layout while images are coming down
  just the same code but done using the jquery methods, for their magics
  comment
  a couple of improvements to the js, no functional changes at all
Search and site wide updates
Merge branch 'search' into develop
Merge branch 'develop' of https://github.com/Make-Magazine/makerapp into develop