Changing the layout for the catalog controller to always include two columns, since the homepage is now a separate controller
Merge pull request #469 from psu-stewardship/catalog_layout

Changing the layout for the catalog controller to always include two col...
Adding bootstrap 3 modal classes to generic_file modals
removing unused layout method
Merge pull request #471 from psu-stewardship/remove_layout

removing unused layout method
Merge pull request #470 from psu-stewardship/edit_modals

Adding bootstrap 3 modal classes to generic_file modals
Correcting Rails app integration issues
Merge pull request #474 from projecthydra/new_dashboard_integration

Correcting Rails app integration issues
Adding collections to the filter for searching. resolves #429
Merge pull request #472 from psu-stewardship/search_collections

Adding collections to the filter for searching. resolves #429
Noid.namespaceize should not append a second namespace onto a pid.
Previously if the passed in identifier had a namespace that was not the
same as the configure namespace it would append a second namespace to
the identifier.  This would create an invalid pid.
Merge pull request #476 from projecthydra/fix_namespaceize

Noid.namespaceize should not append a second namespace onto a pid.
Updating modals and facet paths