Flexgrid

For some reason the update didn't work. I'm hoping this one will with a
restart.
Merge pull request #570 from jon4888/master

Flexgrid