diff --git a/api/admin.go b/api/admin.go
index 8e0a03e4b4..885a95d959 100644
--- a/api/admin.go
+++ b/api/admin.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"strings"
 
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
 
 	"github.com/mattermost/platform/model"
diff --git a/api/api.go b/api/api.go
index 6c7eda0a2f..a6bb229823 100644
--- a/api/api.go
+++ b/api/api.go
@@ -5,7 +5,7 @@ package api
 
 import (
 	"bytes"
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/utils"
 	"html/template"
diff --git a/api/channel.go b/api/channel.go
index 674293e192..706baa004e 100644
--- a/api/channel.go
+++ b/api/channel.go
@@ -4,8 +4,8 @@
 package api
 
 import (
-	l4g "code.google.com/p/log4go"
 	"fmt"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
 	"github.com/mattermost/platform/model"
 	"net/http"
diff --git a/api/command.go b/api/command.go
index db57f0baed..00293cf16f 100644
--- a/api/command.go
+++ b/api/command.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/utils"
diff --git a/api/context.go b/api/context.go
index b39f03a7dc..561884c145 100644
--- a/api/context.go
+++ b/api/context.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/store"
 	"github.com/mattermost/platform/utils"
diff --git a/api/file.go b/api/file.go
index 67ebc14b7c..d023515af1 100644
--- a/api/file.go
+++ b/api/file.go
@@ -5,8 +5,8 @@ package api
 
 import (
 	"bytes"
-	l4g "code.google.com/p/log4go"
 	"fmt"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/disintegration/imaging"
 	"github.com/goamz/goamz/aws"
 	"github.com/goamz/goamz/s3"
diff --git a/api/import.go b/api/import.go
index 81de789752..5c8f993488 100644
--- a/api/import.go
+++ b/api/import.go
@@ -4,7 +4,7 @@
 package api
 
 import (
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/mattermost/platform/model"
 )
 
diff --git a/api/oauth.go b/api/oauth.go
index 5753db8bd6..eb5e0e4968 100644
--- a/api/oauth.go
+++ b/api/oauth.go
@@ -4,8 +4,8 @@
 package api
 
 import (
-	l4g "code.google.com/p/log4go"
 	"fmt"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/utils"
diff --git a/api/post.go b/api/post.go
index 958479427e..be1ecd96a5 100644
--- a/api/post.go
+++ b/api/post.go
@@ -4,8 +4,8 @@
 package api
 
 import (
-	l4g "code.google.com/p/log4go"
 	"fmt"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/store"
diff --git a/api/preference.go b/api/preference.go
index e9c74aafe7..f5c96f1dd6 100644
--- a/api/preference.go
+++ b/api/preference.go
@@ -4,7 +4,7 @@
 package api
 
 import (
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
 	"github.com/mattermost/platform/model"
 	"net/http"
diff --git a/api/server.go b/api/server.go
index 2bab62facf..33428009f6 100644
--- a/api/server.go
+++ b/api/server.go
@@ -4,7 +4,7 @@
 package api
 
 import (
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/braintree/manners"
 	"github.com/gorilla/mux"
 	"github.com/mattermost/platform/store"
diff --git a/api/slackimport.go b/api/slackimport.go
index cab4c61847..e0a0ff0368 100644
--- a/api/slackimport.go
+++ b/api/slackimport.go
@@ -6,8 +6,8 @@ package api
 import (
 	"archive/zip"
 	"bytes"
-	l4g "code.google.com/p/log4go"
 	"encoding/json"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/mattermost/platform/model"
 	"io"
 	"mime/multipart"
diff --git a/api/team.go b/api/team.go
index fbcb301a9a..e2dd8807ed 100644
--- a/api/team.go
+++ b/api/team.go
@@ -5,8 +5,8 @@ package api
 
 import (
 	"bytes"
-	l4g "code.google.com/p/log4go"
 	"fmt"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/store"
diff --git a/api/user.go b/api/user.go
index d4c7fcaf59..6c0ce86d69 100644
--- a/api/user.go
+++ b/api/user.go
@@ -5,9 +5,9 @@ package api
 
 import (
 	"bytes"
-	l4g "code.google.com/p/log4go"
 	b64 "encoding/base64"
 	"fmt"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/disintegration/imaging"
 	"github.com/golang/freetype"
 	"github.com/gorilla/mux"
diff --git a/api/web_conn.go b/api/web_conn.go
index 50a003acea..2b0e290382 100644
--- a/api/web_conn.go
+++ b/api/web_conn.go
@@ -4,7 +4,7 @@
 package api
 
 import (
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/websocket"
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/store"
diff --git a/api/web_hub.go b/api/web_hub.go
index f804888249..4361d10354 100644
--- a/api/web_hub.go
+++ b/api/web_hub.go
@@ -4,7 +4,7 @@
 package api
 
 import (
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/mattermost/platform/model"
 )
 
diff --git a/api/web_socket.go b/api/web_socket.go
index 298e44b448..995e2a6776 100644
--- a/api/web_socket.go
+++ b/api/web_socket.go
@@ -4,7 +4,7 @@
 package api
 
 import (
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/websocket"
 	"github.com/mattermost/platform/model"
diff --git a/api/web_team_hub.go b/api/web_team_hub.go
index 2c2386317a..bb9ed9526c 100644
--- a/api/web_team_hub.go
+++ b/api/web_team_hub.go
@@ -4,7 +4,7 @@
 package api
 
 import (
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/mattermost/platform/model"
 )
 
diff --git a/api/webhook.go b/api/webhook.go
index 34c3088790..a9a88b7b80 100644
--- a/api/webhook.go
+++ b/api/webhook.go
@@ -4,7 +4,7 @@
 package api
 
 import (
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/utils"
diff --git a/config/config.json b/config/config.json
index c43db1e50c..907b668283 100644
--- a/config/config.json
+++ b/config/config.json
@@ -12,10 +12,10 @@
         "EnableTesting": false,
         "EnableDeveloper": false,
         "EnableSecurityFixAlert": true,
-        "SessionLengthWebInDays" : 30,
-        "SessionLengthMobileInDays" : 30,
-        "SessionLengthSSOInDays" : 30,
-        "SessionCacheInMinutes" : 10
+        "SessionLengthWebInDays": 30,
+        "SessionLengthMobileInDays": 30,
+        "SessionLengthSSOInDays": 30,
+        "SessionCacheInMinutes": 10
     },
     "TeamSettings": {
         "SiteName": "Mattermost",
@@ -107,5 +107,28 @@
         "AuthEndpoint": "",
         "TokenEndpoint": "",
         "UserApiEndpoint": ""
+    },
+    "GoogleSettings": {
+        "Enable": false,
+        "Secret": "",
+        "Id": "",
+        "Scope": "",
+        "AuthEndpoint": "",
+        "TokenEndpoint": "",
+        "UserApiEndpoint": ""
+    },
+    "LdapSettings": {
+        "Enable": false,
+        "LdapServer": null,
+        "LdapPort": 389,
+        "BaseDN": null,
+        "BindUsername": null,
+        "BindPassword": null,
+        "FirstNameAttribute": null,
+        "LastNameAttribute": null,
+        "EmailAttribute": null,
+        "UsernameAttribute": null,
+        "IdAttribute": null,
+        "QueryTimeout": 60
     }
 }
\ No newline at end of file
diff --git a/manualtesting/manual_testing.go b/manualtesting/manual_testing.go
index b3d01a5a69..befc835fb1 100644
--- a/manualtesting/manual_testing.go
+++ b/manualtesting/manual_testing.go
@@ -4,7 +4,7 @@
 package manualtesting
 
 import (
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/mattermost/platform/api"
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/utils"
diff --git a/manualtesting/test_autolink.go b/manualtesting/test_autolink.go
index a13ec7a752..16d2d713a1 100644
--- a/manualtesting/test_autolink.go
+++ b/manualtesting/test_autolink.go
@@ -4,7 +4,7 @@
 package manualtesting
 
 import (
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/mattermost/platform/model"
 )
 
diff --git a/mattermost.go b/mattermost.go
index 3d8ab736f9..f86af76e36 100644
--- a/mattermost.go
+++ b/mattermost.go
@@ -17,7 +17,7 @@ import (
 	"syscall"
 	"time"
 
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/mattermost/platform/api"
 	"github.com/mattermost/platform/manualtesting"
 	"github.com/mattermost/platform/model"
diff --git a/model/client.go b/model/client.go
index 14746f8ae6..75b93c9710 100644
--- a/model/client.go
+++ b/model/client.go
@@ -5,8 +5,8 @@ package model
 
 import (
 	"bytes"
-	l4g "code.google.com/p/log4go"
 	"fmt"
+	l4g "github.com/alecthomas/log4go"
 	"io/ioutil"
 	"net/http"
 	"net/url"
diff --git a/store/sql_preference_store.go b/store/sql_preference_store.go
index 3077611503..6302d2f4f8 100644
--- a/store/sql_preference_store.go
+++ b/store/sql_preference_store.go
@@ -4,7 +4,7 @@
 package store
 
 import (
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/go-gorp/gorp"
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/utils"
diff --git a/store/sql_session_store.go b/store/sql_session_store.go
index 86604b4fe7..6b0a314432 100644
--- a/store/sql_session_store.go
+++ b/store/sql_session_store.go
@@ -4,7 +4,7 @@
 package store
 
 import (
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/mattermost/platform/model"
 )
 
diff --git a/store/sql_store.go b/store/sql_store.go
index d17a3e8c3d..d0471fa1e7 100644
--- a/store/sql_store.go
+++ b/store/sql_store.go
@@ -4,7 +4,6 @@
 package store
 
 import (
-	l4g "code.google.com/p/log4go"
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/hmac"
@@ -16,6 +15,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	l4g "github.com/alecthomas/log4go"
 	"io"
 	sqltrace "log"
 	"math/rand"
diff --git a/store/store.go b/store/store.go
index 8e03c8ee72..179cfecd7b 100644
--- a/store/store.go
+++ b/store/store.go
@@ -4,7 +4,7 @@
 package store
 
 import (
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/mattermost/platform/model"
 	"time"
 )
diff --git a/utils/config.go b/utils/config.go
index 18bd152414..12d03b5de8 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -11,7 +11,7 @@ import (
 	"path/filepath"
 	"strconv"
 
-	l4g "code.google.com/p/log4go"
+	l4g "github.com/alecthomas/log4go"
 
 	"github.com/mattermost/platform/model"
 )
@@ -77,7 +77,9 @@ func configureLog(s *model.LogSettings) {
 			level = l4g.ERROR
 		}
 
-		l4g.AddFilter("stdout", level, l4g.NewConsoleLogWriter())
+		lw := l4g.NewConsoleLogWriter()
+		lw.SetFormat("[%D %T] [%L] %M")
+		l4g.AddFilter("stdout", level, lw)
 	}
 
 	if s.EnableFile {
diff --git a/utils/mail.go b/utils/mail.go
index 6625060de8..2f2c10b619 100644
--- a/utils/mail.go
+++ b/utils/mail.go
@@ -4,10 +4,10 @@
 package utils
 
 import (
-	l4g "code.google.com/p/log4go"
 	"crypto/tls"
 	"encoding/base64"
 	"fmt"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/mattermost/platform/model"
 	"net"
 	"net/mail"
diff --git a/web/web.go b/web/web.go
index bf1208adcb..5cc0e288d3 100644
--- a/web/web.go
+++ b/web/web.go
@@ -4,8 +4,8 @@
 package web
 
 import (
-	l4g "code.google.com/p/log4go"
 	"fmt"
+	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
 	"github.com/mattermost/platform/api"
 	"github.com/mattermost/platform/model"