Change gitolite ssh host name and port
fix gitlab host and port
Fix some conflicts
Fix some minor issue
Merge pull request #9 from nhannguyen/master

Fix hostname and port