Tidied up rakefile requires and made it use bundler correctly