Squashed commit of the following:

commit 8b2d7e150b5c81d6b60d6ec1260e9c49d75e1174
Author: vagrant <vagrant@ubuntu.(none)>
Date:   Fri Jan 3 18:17:09 2014 +0000

    Bringing rspec tests up to date

    - Started working on parser tests and realized there were some holes
    - Fixed some failing rspec tests
    - Left some failing tests that are depending on a factory overhaul
    - Stubbed as many of the missing tests as possible

commit b936403bde9fb98aedd7670058ff1491b760a429
Author: Jeremiah Hemphill <jeremiah.hemphill@gmail.com>
Date:   Fri Jan 3 16:28:24 2014 +0000

    Moved the parser to a Base and Company class

    Started working on testing.

commit c4723b4279421d252906e5ea65a427aa2bb9e640
Merge: 6564c74 edd96f5
Author: Josh Lauer <josh@cloudspace.com>
Date:   Thu Jan 2 16:16:25 2014 -0500

    Merge branch 'crunchbase_api_reboot' of github.com:cloudspace/api.crunchinator.com into crunchbase_api_reboot

commit 6564c7441c3e23bc03e1a9b3d2f212ebd68bb99e
Author: Josh Lauer <josh@cloudspace.com>
Date:   Thu Jan 2 16:16:13 2014 -0500

    significant enhancements to importer and controllers

commit edd96f55c03df746a86e30eaff6f6438131fb957
Author: Michael Orr <michael@cloudspace.com>
Date:   Thu Dec 26 10:49:49 2013 -0500

    commenting out pending rspec tests, we will remove these after checking with josh

commit 3cd34913418f400f9d19bfb8140de0678ee853cf
Author: Michael Orr <michael@cloudspace.com>
Date:   Thu Dec 26 15:26:37 2013 +0000

    spec testing for office locations

commit 61dd06d0781ec82ac855a1ee991e5e7c57dc1b83
Merge: 7a6d6c7 2afe030
Author: Michael Orr <michael@cloudspace.com>
Date:   Thu Dec 19 14:32:00 2013 -0500

    Merge branch 'crunchbase_api_reboot' of github.com:cloudspace/api.crunchinator.com into crunchbase_api_reboot

commit 7a6d6c756f477ad9ec9422489e844cf2d7b93921
Author: Michael Orr <michael@cloudspace.com>
Date:   Thu Dec 19 14:31:47 2013 -0500

    models are now fully tested, and includes a small bugfix to element model scope

commit 2afe03062bcdb7b6b454ee9893c30623f8201b35
Author: Josh Lauer <josh@cloudspace.com>
Date:   Wed Dec 18 22:30:09 2013 -0500

    refactored ApiQueue::Parser a bit

commit 3d42bd6468dc8a689c50314b929f8e97845308cf
Author: Josh Lauer <josh@cloudspace.com>
Date:   Wed Dec 18 16:27:35 2013 -0500

    added OfficeLocation migration, model, associations

commit 854cbbafc56e8e2e67b5876c6893c6b884b84f10
Author: Josh Lauer <josh@cloudspace.com>
Date:   Wed Dec 18 14:42:44 2013 -0500

    created ApiQueue::Controller class as a public-facing interface to the queue system
    ApiQueue::Source::Crunchbase now handles redirects in the get_entity action

commit 4b1c8b6bbaf8306281180419ef3d2cdbd021a3a9
Author: Josh Lauer <josh@cloudspace.com>
Date:   Tue Dec 17 20:57:24 2013 -0500

    fixed a broken test

commit 1d71ebd23ffbc53ed387cb9f27e1563fe939250f
Merge: 6833868 98e165c
Author: Josh Lauer <josh@cloudspace.com>
Date:   Tue Dec 17 20:55:15 2013 -0500

    merge conflict

commit 6833868453ad93cff3acf2f3d580fd78e59ab5bf
Author: Josh Lauer <josh@cloudspace.com>
Date:   Tue Dec 17 20:53:36 2013 -0500

    all data sources and archive targets working in all combinations

commit 98e165cc6b4dbe1446a5479a9ac1e2c945efae4d
Author: Michael Orr <michael@cloudspace.com>
Date:   Tue Dec 17 18:14:40 2013 -0500

    adding rspec tests

    fixed issue with name method in Person
    fixed missing validates_precense_of where we had validates_uniqueness_of
    fixed misnamed field in FinancialOrganization

commit c4a76e0ac8c0b41a6c609b490ac2757c0a1f434b
Author: Michael Orr <michael@cloudspace.com>
Date:   Mon Dec 16 18:00:53 2013 -0500

    Add model and relationships for Financial Organizations - also integrate with importer and start creating objects

commit 095f600412d939f04d0e0406879400037a6bcb6e
Merge: 20f489a 21ab80a
Author: Michael Orr <michael@cloudspace.com>
Date:   Mon Dec 16 16:15:04 2013 -0500

    Merge branch 'crunchbase_api_reboot' of github.com:cloudspace/api.crunchinator.com into crunchbase_api_reboot

commit 20f489a965da2b76df67080cfc7feb8e97450e27
Author: Michael Orr <michael@cloudspace.com>
Date:   Mon Dec 16 16:14:46 2013 -0500

    update README - specify sudo must be used when installing bundler

commit 21ab80ab5ee4f601f2a287d052205855cb925d48
Author: Josh Lauer <josh@cloudspace.com>
Date:   Mon Dec 16 16:09:52 2013 -0500

    added namespace:string attribute to ApiQueue::Element
    refactored existing references to namespaces to use this attribute rather than splitting it out of the permalink
    removed the s3 gem and replaced with the aws-sdk gem
    began modifying the ApiQueue::Source::S3 to work again and use the aws-sdk gem

commit af24bb346fc54f96bb103d6e283f3b8e432f6da4
Merge: 11b471f efc5a12
Author: Josh Lauer <josh@cloudspace.com>
Date:   Mon Dec 16 13:06:28 2013 -0500

    mysterious merge conflict

commit 11b471f86b38cb52e465a2d501278716d8738e1b
Author: Josh Lauer <josh@cloudspace.com>
Date:   Mon Dec 16 12:55:13 2013 -0500

    removed a couple of files

commit 2d4b864ff429e612019116e4828c2e374d2e3f85
Author: Josh Lauer <josh@cloudspace.com>
Date:   Mon Dec 16 12:53:10 2013 -0500

    huge amounts of refactoring the importer

commit 83ffdad08e6dfb694fa94ff4a0ca2787610b7263
Author: Josh Lauer <josh@Joshs-MacBook-Pro-2.local>
Date:   Fri Dec 13 12:40:55 2013 -0500

    chugging away

commit 16b4168a29b19e2cf8c566ed5c0a3bde6010064c
Author: Josh Lauer <josh@Joshs-MacBook-Pro-2.local>
Date:   Fri Dec 13 11:23:35 2013 -0500

    saving my spot

commit 3f718200d682e844384d745f6013f770286f88bf
Author: Josh Lauer <jlauer@cloudspace.com>
Date:   Mon Dec 9 18:03:16 2013 -0500

    chugging away

commit efc5a120295ee7471e050f2a5e08d689f49b1590
Author: Josh Lauer <josh@Joshs-MacBook-Pro-2.local>
Date:   Fri Dec 13 12:40:55 2013 -0500

    chugging away

commit 976e6aec2e5ae95812a7b4ab4ca2b1629eb177a8
Author: Josh Lauer <josh@Joshs-MacBook-Pro-2.local>
Date:   Fri Dec 13 11:23:35 2013 -0500

    saving my spot

commit 3a4d854f11d9311f416d43fdf399c8afcd6334e9
Author: Josh Lauer <jlauer@cloudspace.com>
Date:   Mon Dec 9 18:03:16 2013 -0500

    chugging away