Add bundler to manage dependencies
Merge branches 'bundler' and 'master'