Init commit.
Updated gemspec. Made this gem a mountable rails engine.
Fixed merge conflicts.