Merge branch 'rickcarlino-master'
Merge branch 'master' of https://github.com/FarmBot/OpenFarm
Add ElasticSearch support via SearchKick
Merge pull request #234 from rickcarlino/master

Production Build for October 7th
Hound
move errors into alert
removing shared devise links
style changes
missed one
removed some spaces
Merge branch 'master' of https://github.com/FarmBot/OpenFarm
Merge pull request #236 from rickr/185

Fixes #185.
Merge branch 'master' of https://github.com/FarmBot/OpenFarm into update-guides
Add user serializer to not give out user email address over unprotected API show.

* Added user serializer to not give out email address over unauthorized API access
* Add show to skip_before_action so that the user is fetched from the API when non-logged in users view a guide.
* Fix markdown directory reference in Angular (I think?)
* Removed references to GUIDE_ID, AUTH_TOKEN, and USER_ID.

* Is there a way to specify two different API serializers for the same endpoint? Probably.
Actually push the things that changed
Update Gemfile.lock for Travis CI
Use Ruby's new JSON-like syntax
Simplified some of the things on the new password page. It was a bit messy
Moved alert box outside of the form to be consistent with rest of site
Merge branch '227-searchkick' of https://github.com/digital-dreamer/OpenFarm into 227-searchkick