Some updates to be versionized
Merge branch 'master' of https://github.com/vitalyp/activefile

Conflicts:
	README.rdoc