Rename models to lib
Merge branch 'master' into scraping

Conflicts:
	test/test_helper.js