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
Merge pull request #10 from joePasz/master

serverupdate
Merge pull request #11 from joePasz/master

Disabled sign up
Merge pull request #12 from joePasz/master

fix bar loading issue if you never accept or decline location
new deals
Merge pull request #5 from ebeiersdorfer/master

new deals