association caching is f up.
now works with rails 4.1
some doc improvements
modre doc fixes
damn markup
Merge branch 'rails4.1'

Conflicts:
	.travis.yml