Removed my gosh darned binding.pry
Merge branch 'tw-views2'