Merge pull request #1 from zetetic/master

Rails 3 fixes for acts_as_wiki
simplified the rvmrc file
Version bump to 0.2.16
version pump for latest patch
Merge branch 'master' of https://github.com/zetetic/acts_as_wiki

Conflicts:
	VERSION