Merge pull request #52 from JBrianGordon/jamesbranch

fixes merge conflicts again
makes very minor improvement to top bar. so over this.
Merge branch 'kellybranch'
implements map and table on venue index, refines search, improves search button appearance
Merge pull request #53 from JBrianGordon/kellybranch

implements map and table on venue index, refines search, improves search...
ignores secrets
ignores secrets 2
Merge pull request #54 from JBrianGordon/kellybranch

ignore secrets
minor style improvements and code cleanup
Merge branch 'kellybranch'
adds a google map to the venue show page
fixes merge conflict