Merge branch 'master' of https://github.com/thaiat/cloudinary_npm into thaiat-master

# Conflicts:
#	lib/api.js
#	lib/config.js
#	lib/preloaded_file.js
#	lib/upload_stream.js
#	lib/uploader.js
#	lib/utils.js
#	lib/utils.js.map
#	lib/v2/api.js
#	lib/v2/index.js
#	lib/v2/uploader.js

Author: Amir Tocker