created a test that passed and changed models
added failing vcr tests
Cleaned up indentation & such
Merged VCR branch, cleaned up stuff from tests.