Merge pull request #83 from pulibrary/development

Updating Master
Merge pull request #84 from pulibrary/development

Latest, with rake cleanups, etc.
change solr path
update cap deploy files
Call spec not in prodution, banish .DS_Store
remove shared assets
pulstore1 becomes pustore2
dummy production values
clear caches
change scope of factory
update gemfile
reset solr path
merge conflict with master