Search now using ES pagination, but no data merging for now. Also stubbing demo
adding demo data and first part of demo
downgrading less-rails away from some bugs
Updating the demo for search
Merge branch 'master' of github.com:cblair/portal
Merging working, except pagination numbers are wrong (I think)
doc saves from search merges working
merged in integration