fixing numbering for merge search
updating demo page
Adding printing of search time
taking out more merge stuff from main search
Merge branch 'master' of github.com:cblair/portal
adding search alerts after search takes too long
fixing/updating Save As from merge search
removed URI escape in ES helper; still have some sort of escaping to do
Document helper CSV bug fix.
Fixed a bug that would delete the first data line when using the internal
CSV filter.

Signed-off-by: shanesuofi <shanes@vandals.uidaho.edu>
Adding doc view download button, fixing bulk collection submit_job so that only unvalidated docs get new jobs
Merge branch 'master' of github.com:cblair/portal
fixing ES pagination off by one error
committing config for new relic
adding roo to gemfile
Merge branch 'master' of github.com:cblair/portal
Adding Excel filter
Merge branch 'master' of https://github.com/cblair/portal into integration
Includes Excel imports and combined ifilters/CSV parseing.

Signed-off-by: shanesuofi <shanes@vandals.uidaho.edu>
Merged master into integration.
Changed the way a file is opened if it is not Excel (CSV/ plain text),
should support non-English charaters now.

Signed-off-by: shanesuofi <shanes@vandals.uidaho.edu>