Greatly simplified activerecord integration - closes #19