Merge pull request #3 from 0robustus1/fix_import_special_handling

Fix import special handling
reset bundlercaching and use ruby 2.1.5 on travis.
allow current bundler versions and add the lock.