Merge pull request #9 from crlyli/datafixture_fb

Datafixture fb
Merge pull request #10 from crlyli/development

Set up API and altered urls
Merge pull request #11 from crlyli/development

Implemented django haystack using whoosh backend
Merge pull request #13 from crlyli/development

Altered views and created tests
Merge pull request #14 from crlyli/development

Adding files to git.
Catching up my code for the UNGMAP.

I had to upstream from Will's repo to pull down the code.  I changed some of the stuff with the carousel and base.html.  Right now, I'm having a problem with the haystack module from Crystal's code--will look at it soon.
Merge pull request #16 from clsmit8703/bs_fb

Catching up my code for the UNGMAP.
Merge pull request #1 from wc351/development

Creating a pull