wip
UPdated bundler
Fix performance issue
Version bump to 0.6.4
Merge branch 'master' into generator

Conflicts:
	Gemfile
Fix active record driver to prevent column name collisions
Allow HTML class to be specified for each column in the report.
Merge pull request #50 from bikeexchange/allow_class_per_column

Allow HTML class to be specified for each column in the report.
:data option to provide CSV alternative to :html option
Rework combined HTML & data columns:

  * html wrappings are specified as an option argument
  * data computation is preserved in the original block
Allow model & grid to be passed to HTML wrapper blocks
Black border for screenshot
Merge branch 'master' of github.com:bogdan/datagrid
Integer range filter form builder
Merge pull request #54 from bikeexchange/allow_data_for_html_columns

:data option to provide CSV alternative to :html option
fix a bug
Update readme
Version bump to 0.7.0
Regenerate gemspec for version 0.7.0
Bugfix scope given as AR association