Atomパッケージアップデート
atom
Merge branch 'master' of github.com:bojovs/dotfiles

Conflicts:
	.atom/config.cson
	.atom/packages/autocomplete-snippets/node_modules/autocomplete-plus/node_modules/temp/node_modules/rimraf/LICENSE
	.atom/packages/rails-transporter/CHANGELOG.md
	.atom/packages/rails-transporter/lib/file-opener.coffee
	.atom/packages/rails-transporter/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/README.md
	.atom/packages/rails-transporter/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/README.markdown
	.atom/packages/rails-transporter/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/index.js
	.atom/packages/rails-transporter/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/package.json
	.atom/packages/rails-transporter/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/node_modules/concat-map/test/map.js
	.atom/packages/rails-transporter/node_modules/glob/node_modules/minimatch/node_modules/brace-expansion/package.json
	.atom/packages/rails-transporter/node_modules/glob/package.json
	.atom/packages/rails-transporter/package.json
/.atom/packagesは無視する
update