Merge branch 'c-torqbox' into development

* c-torqbox:
  Update torqbox
Add Facebook omniauth
Merge branch 'development' into f-omniauth

* development:
  Refactor populate to use do/end instead of brackets
  fixed inconsistency with experience edit feature
  All cuke tests pass
  refactor builds to creates in factories, person and vendor features now working
  Fix rspec for new factories
  Refactor populate and factories to have proper associations. Work to be done on Testing... currently failing
Fix merge conflicts
Merge branch 'f-omniauth' into development

* f-omniauth:
  Add Facebook omniauth