add .rvmrc to gitignore
add autotest
Merge branch 'master' of https://github.com/abangratz/penpusher-admin

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'master' into add_welcome_page_20130209

* master:
  add autotest
  add .rvmrc to gitignore