Change to refeflect filename changes
Update nested_attributes to work with activerecord 4.0.x
Merge branch 'fix-ar-4-issues' of git://github.com/nddeluca/composite_primary_keys

Conflicts:
	test/test_suite.rb