Merge pull request #2 from sankethkatta/master

set file content-type to zip for upload
version bump
added logging
added --force option
implemented merge project with tests, also fixed failing build_options test