pulling
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into auto_complete
fixed conflicts
pulling
fixed conflicts
Merge pull request #79 from dbcfoxes2014/deployment_setup

Put database yml file into gitignore.
fixed bug where similar media wasn't loading. Also search checkboxes are modified
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into similar_media
Merge pull request #80 from dbcfoxes2014/similar_media

Similar media
Enabled working slideshow functionality(need to figure out why ffmpeg shits bricks but still outputs)
fixed merge conflicts
Merge pull request #81 from dbcfoxes2014/slideshow_editor

Slideshow editor
Updated travis yaml file to custom ruby 1.9.3-p484
Adjust Gemfile and gemfile lock for Capistrano version 2.14.2
Adjust Capstrano version in README and added DNS address.
Updated Capistrano to 2.14.2