Merge pull request #44 from maxluzuriaga/master

Content/Spark type validations
Added gem 'Faker' to allow for seeding the database
Updated gemfile.lock
Weird change to Gemfile.lock, no idea why this is needed but it is.
Merge remote-tracking branch 'upstream/master'