Jetbrains stuff

Conflicts:
	.idea/.generators
	.idea/aventine-rails.iml
	.idea/misc.xml
	.idea/workspace.xml
bug fix

Conflicts:
	.gitignore
Merge branch 'master' of github.com:aventinesolutions/aventine-rails into HEAD
bug fix

Conflicts:
	.gitignore