csv_export now accepts a collection as the second parameter, with the default being the controller collection method
git ignore addition
Merge branch 'master' of https://github.com/marketboomer/nunchaku into sass_changes

Conflicts:
	.gitignore
Merge pull request #6 from marketboomer/sass_changes

Allow csv_export method to pass a collection