update gitignore for rvm and rubymine
Merge branch 'master' into integrated_blog

Conflicts:
	.gitignore