Moving to https
resolving conficts
Added solarized