Issue 2215: Error 500 on GE Summary page
Issue 2215: Adding tests
3605 Cache JavaScript files as one
3806 add Twitter Javascript to chapters/show
3806 Move Twitter JavaScript to work navigation partial so it is included for chapters
Issue 3038: Adding bookmarks to closed collections
Issue 3083: Bookmarks to closed collections. Adding tests
Issue 3083: Bookmarks to closed collections. Adding tests
Removing a straggling setflash
Trying to avoid a Travis-Only error
More testing fixes
Stab in the Dark
Stab in the dark #2
Secluding the bookmark features in their own directory
search collections
Merge remote-tracking branch 'scottsds/issue_2215' into Group6a

# By Scott D. Sullivan
# Via Scott D. Sullivan
* scottsds/issue_2215:
  Issue 2215: Adding tests
  Issue 2215: Error 500 on GE Summary page

Conflicts:
	features/gift_exchanges/challenge_giftexchange.feature
Merge remote-tracking branch 'sarken2/issue_3605' into Group6a

# By sarken
# Via sarken
* sarken2/issue_3605:
  3605 Cache JavaScript files as one
Merge remote-tracking branch 'sarken2/issue_3806' into Group6a

# By sarken
# Via sarken
* sarken2/issue_3806:
  3806 Move Twitter JavaScript to work navigation partial so it is included for chapters
  3806 add Twitter Javascript to chapters/show
Merge branch 'i2391' into Group6a

* i2391:
  search collections
Merge remote-tracking branch 'scottsds/issue_3083_fixed' into Group6a

# By Scott D. Sullivan
# Via Scott D. Sullivan
* scottsds/issue_3083_fixed:
  Secluding the bookmark features in their own directory
  Stab in the dark #2
  Stab in the Dark
  More testing fixes
  Trying to avoid a Travis-Only error
  Removing a straggling setflash
  Issue 3083: Bookmarks to closed collections. Adding tests
  Issue 3083: Bookmarks to closed collections. Adding tests
  Issue 3038: Adding bookmarks to closed collections