Merge branch 'develop' of github.com:Pterodactyl/wings into develop

# Conflicts:
#	api/api.go
#	api/core_routes.go
#	api/handlers_server.go
#	api/routes_server.go
#	config.example.json
#	utils/logging.go

.gitignore

@@ -3,6 +3,7 @@
 *.dll
 *.so
 *.dylib
+.idea/*
 
 # Test binary, build with `go test -c`
 *.test
@@ -20,7 +21,7 @@
 /logs/*
 
 # ignore configuration file
-/config.json
+/config.yml
 
 # Ignore Vagrant stuff
 /.vagrant