Merge branch 'master' into cap_change
Merge branch 'cap_change'
Merge branch 'master' of github.com:nulib/menu
Merge pull request #22 from nulib/update_gems

ran a bundle update and ran tests. looks good; Tests pass, looks good
Merge branch 'master' of github.com:nulib/menu
Ignore tags file
Truncate error messages so cookie doesn't overflow
updated gems again