Solve conflict with opscode nginx cookbook. Allow side-by-side use of nginx cookbook and gitlab cookbook.
Rename nginx.default.conf.erb to nginx.gitlab.conf.erb
Adapt README and fix wrong naming of attribute listen_port
Removed duplicate attribute
Updated gitlab and gitolite url
Use git protocol to clone gitolite and gitlab
Update comment
Init default attributes for nginx listen ip and port correctly
Add space
Get cookbook working with nginx cookbook on RHEL distros
Fix calculating listen port depending on https flag
Use case statement on string comparison
Merge commit 'refs/pull/24/head' of https://github.com/atomic-penguin/cookbook-gitlab

Conflicts:
	README.md
	attributes/default.rb
	metadata.rb
	recipes/default.rb