Merge pull request #2 from joePasz/master

WS Pull
Merge pull request #3 from joePasz/master

Added Devise and basic admin control
Merge pull request #4 from joePasz/master

Server Update
Merge pull request #5 from joePasz/master

background and such
Merge pull request #6 from joePasz/master

Server Update
Merge pull request #7 from joePasz/master

server update
Merge pull request #8 from joePasz/master

Delete 20140414190209_devise_create_users.rb
Merge pull request #9 from joePasz/master

site update
Added multi account twitter feed, fixed several map bugs, added links to bars from calendar page, made tile images clickable, updated single bar page layout
Trying to merge
Merge branch 'master' of https://github.com/joePasz/bar-website
bars are now in order based on location
fixed seed error, should reseed
tweaked deals and main twitter, temporary
fixed editing issue
commiting before possibly breaking my build
Merge pull request #10 from joePasz/master

serverupdate
Disabled sign up
Merge pull request #11 from joePasz/master

Disabled sign up
fix bar loading issue if you never accept or decline location