Merge pull request #11 from bpotterbaum/master

Fixed conflicts, she's a clean merge.
No mysql please
whoops
Update Gemfile

Changing Puma to 2.1 - Trying to resolve a production bug issue where puma just doesn't wana do anything else while the subscription stream is going
We love that .lock file, ohh ya
Putting in a possible work-around where the subscription is happening in it's own controller
Hrm... x-accel-buffering eh\?
New Default grid size
Putting in postgres for the server
Putting in a natural order the grid is relying on and fixing the deploy
Moving it into the view
Merge pull request #10 from benfalk/master

lets do this!