Merge pull request #1 from seanmcneil/master

Pushing core data / search controller
did stuff
Merge remote-tracking branch 'origin/master'
Merge pull request #2 from vossgang/matt-copy

Matt copy
merge
Merge pull request #3 from vossgang/matt-copy

merge
ALL THE MERGES!
Merge remote-tracking branch 'upstream/master'
Testing keyword search
Revised DSCard