Lints and adds some spaces for better reading
Exposes Model.properties
Passes Model to Instance directly, changes Instance to use Model.properties instead of opts.properties
Merges conflits
Merge branch 'master' of github.com:dresende/node-orm2

* 'master' of github.com:dresende/node-orm2:
  Travis doesn't support nodejs 0.4
  Node 0.6 support
  Place save-related hooks closer to the actioning code. Fix hook tests; Date.now() produced identical timestamps. Change parameters of Instance.validate callback. Add some Instance tests.

Conflicts:
	lib/Instance.js