Added bundler support in preparation for travis