Added rubymine-60.cfg file
Added changelog entry
Merged Rubymine 4,5,6 support into one
Merge branch 'master' of https://github.com/lra/mackup into ToggleApps

Conflicts:
	CHANGELOG.md