fixed caption field bug -- changed type from string to text, fixed unless statement
merged master onto tuples
Merge pull request #7 from gopher-snakes-2013/tuples-module

tuples-module: fixed scraper.rb
working model and controller tests
fixed .text of caption
Merge pull request #8 from gopher-snakes-2013/model_tests

working model and controller tests
fixed conflict