rename variable containig actual test file
clean up vimrc test script
add default .rspec options
fix .vimrc merge