Commented out rubocop pull from github master and just let it pull the latest from rubygems instead
Made the spec more readable
Added database flush