diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c9a5f65631..d352c333bc 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -101,10 +101,10 @@
     ; be stored here. The OpenSim.exe process must have R/W access to the location.
     ; RegistryLocation = "."
 
-	;# {ConfigDirectory} {} {Set path to directory for modular ini files} {}
+    ;# {ConfigDirectory} {} {Set path to directory for modular ini files} {}
     ; Used by region module addins. You can set this to outside bin, so that addin
-	; configurations will survive updates. The OpenSim.exe process must have R/W access 
-	; to the location.
+    ; configurations will survive updates. The OpenSim.exe process must have R/W access 
+    ; to the location.
     ; ConfigDirectory = "."
 
     ;# {region_info_source} {} {Where to load region from?} {filesystem web} filesystem
@@ -164,7 +164,7 @@
     ;; physical prim max, clamp the dimensions to the appropriate maximum
     ;; This can be overridden in the region config file.
     ; ClampPrimSize = false
-	
+
     ;# {LinksetPrims} {} {Max prims an object will hold?} {} 0
     ;; Maximum number of prims allowable in a linkset. Affects creating new
     ;; linksets. Ignored if less than or equal to zero.
@@ -406,9 +406,9 @@
 
 [Estates]
     ; If these values are commented out then the user will be asked for estate details when required (this is the normal case).
-  	; If these values are uncommented then they will be used to create a default estate as necessary.
+    ; If these values are uncommented then they will be used to create a default estate as necessary.
     ; New regions will be automatically assigned to that default estate.
-	
+
     ;# {DefaultEstateName} {} {Default name for estate?} {} My Estate
     ;; Name for the default estate
     ; DefaultEstateName = My Estate
@@ -418,7 +418,7 @@
     ; DefaultEstateOwnerName = FirstName LastName
 
 
-    ; ** Standalone Estate Settings **	
+    ; ** Standalone Estate Settings **
     ; The following parameters will only be used on a standalone system to 
     ; create an estate owner that does not already exist
 
@@ -506,15 +506,15 @@
     ;; web server
     ; user_agent = "OpenSim LSL (Mozilla Compatible)"
 
-	;; The follow 3 variables are for HTTP Basic Authentication for the Robust services.
-	;; Use this if your central services in port 8003 need to be accessible on the Internet
-	;; but you want to protect them from unauthorized access. The username and password
-	;; here need to match the ones in the Robust service configuration.
+    ;; The follow 3 variables are for HTTP Basic Authentication for the Robust services.
+    ;; Use this if your central services in port 8003 need to be accessible on the Internet
+    ;; but you want to protect them from unauthorized access. The username and password
+    ;; here need to match the ones in the Robust service configuration.
     ; AuthType = "BasicHttpAuthentication"
     ; HttpAuthUsername = "some_username"
     ; HttpAuthPassword = "some_password"
-	;;
-	;; Any of these 3 variables above can be overriden in any of the service sections.
+    ;;
+    ;; Any of these 3 variables above can be overriden in any of the service sections.
 
 
 [XMLRPC]
@@ -794,14 +794,14 @@
     ;; the data snapshots.
     ; snapshot_cache_directory = "DataSnapshot"
 
-	;; [Supported, but obsolete]
+    ;; [Supported, but obsolete]
     ;# {data_services} {index_sims:true} {Data service URLs to register with?} {} http://metaverseink.com/cgi-bin/register.py
     ; This semicolon-separated string serves to notify specific data services
     ; about the existence of this sim. Uncomment if you want to index your
     ; data with this and/or other search providers.
     ; data_services="http://metaverseink.com/cgi-bin/register.py"
 
-	;; New way of specifying data services, one per service
+    ;; New way of specifying data services, one per service
     ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py"
 
 [Economy]
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 69a2a4a06d..4faf7f3e83 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -78,8 +78,8 @@
     RegistryLocation = "."
 
     ; Used by region module addins. You can set this to outside bin, so that addin
-	; configurations will survive updates. The OpenSim.exe process must have R/W access 
-	; to the location.
+    ; configurations will survive updates. The OpenSim.exe process must have R/W access 
+    ; to the location.
     ConfigDirectory = "."
 
     ; ##
@@ -127,7 +127,7 @@
     ; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum
     ; This can be overridden in the region config file.
     ClampPrimSize = false
-	
+
     ; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero.
     ; This can be overridden in the region config file.
     LinksetPrims = 0
@@ -1092,8 +1092,8 @@
     ;    shape. 'Compound' uses a lot less CPU time.
     LinkImplementation = 1      ; 0=constraint, 1=compound
 
-	; If 'true', offset a linkset's origin based on mass of linkset parts.
-	LinksetOffsetCenterOfMass = false
+    ; If 'true', offset a linkset's origin based on mass of linkset parts.
+    LinksetOffsetCenterOfMass = false
 
     ; If 'true', turn scuplties into meshes
     MeshSculptedPrim = true
@@ -1401,7 +1401,7 @@
     snapshot_cache_directory = "DataSnapshot"
 
     ; Uncomment if you want to index your data with this and/or other search providers. One entry per
-	; data service
+    ; data service
     ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py"
 
 [Economy]
@@ -1739,7 +1739,7 @@
 
     ; Experimental option to only message cached online users rather than all users
     ; Should make large group with few online members messaging faster, as the expense of more calls to ROBUST presence service
-	; (Flotsam groups only; in V2 this is always on)
+    ; (Flotsam groups only; in V2 this is always on)
     MessageOnlineUsersOnly = false
 
     ; Service connectors to the Groups Service.  Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
@@ -1874,7 +1874,7 @@
 [GridService]
     ;; default standalone, overridable in StandaloneCommon.ini
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-	
+
 
 [AutoBackupModule]
     ;; default is module is disabled at the top level
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 46dbc17ecf..5fa4026463 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -110,8 +110,8 @@
     ;; Uncomment for UserProfiles see [UserProfilesService] to configure...
     ; UserProfilesServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:UserProfilesConnector"
 
-	;; Uncomment if you want to have centralized estate data
-	; EstateDataService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:EstateDataRobustConnector"
+    ;; Uncomment if you want to have centralized estate data
+    ; EstateDataService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:EstateDataRobustConnector"
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
@@ -163,18 +163,18 @@
 
 [Hypergrid]
     ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
-	;; This is the address of the external robust server that
-	;; runs the UserAgentsService, possibly this server.
-	;; For example http://myworld.com:8002
-	;; This is a default that can be overwritten in some sections.
-	; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
+    ;; This is the address of the external robust server that
+    ;; runs the UserAgentsService, possibly this server.
+    ;; For example http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
     ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
-	;; This is the address of the external robust server
-	;; that runs the Gatekeeper service, possibly this server.
-	;; For example http://myworld.com:8002
-	;; This is a default that can be overwritten in some sections.
-	; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
+    ;; This is the address of the external robust server
+    ;; that runs the Gatekeeper service, possibly this server.
+    ;; For example http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 
 [DatabaseService]
@@ -328,7 +328,7 @@
     ; for the server connector
     AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     UserAccountServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-	
+
 
 ; * This is the new style user service.
 ; * "Realm" is the table that is used for user lookup.
@@ -527,7 +527,7 @@
 
     ; password help: optional: page providing password assistance for users of your grid
     ;password = ${Const|BaseURL}/password
-	
+
     ; HG address of the gatekeeper, if you have one
     ; this is the entry point for all the regions of the world
     ; gatekeeper = ${Const|BaseURL}:${Const|PublicPort}/
@@ -548,7 +548,7 @@
     AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
     SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
     ; how does the outside world reach me? This acts as public key too.
-	;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
+    ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
     ; ExternalName = "${Const|BaseURL}:${Const|PublicPort}"
 
     ; Does this grid allow incoming links to any region in it? 
@@ -558,20 +558,20 @@
     ; If you run this gatekeeper server behind a proxy, set this to true
     ; HasProxy = false
 
-	;; Regular expressions for controlling which client versions are accepted/denied.
-	;; An empty string means nothing is checked.
-	;;
-	;; Example 1: allow only these 3 types of clients (any version of them)
-	;; AllowedClients = "Imprudence|Hippo|Second Life"
-	;;
-	;; Example 2: allow all clients except these
-	;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
-	;;
-	;; Note that these are regular expressions, so every character counts.
-	;; Also note that this is very weak security and should not be trusted as a reliable means
-	;; for keeping bad clients out; modified clients can fake their identifiers.
-	;;
-	;;
+    ;; Regular expressions for controlling which client versions are accepted/denied.
+    ;; An empty string means nothing is checked.
+    ;;
+    ;; Example 1: allow only these 3 types of clients (any version of them)
+    ;; AllowedClients = "Imprudence|Hippo|Second Life"
+    ;;
+    ;; Example 2: allow all clients except these
+    ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
+    ;;
+    ;; Note that these are regular expressions, so every character counts.
+    ;; Also note that this is very weak security and should not be trusted as a reliable means
+    ;; for keeping bad clients out; modified clients can fake their identifiers.
+    ;;
+    ;;
     ;AllowedClients = ""
     ;DeniedClients = ""
 
@@ -590,12 +590,12 @@
 [UserAgentService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService"
     ;; for the service
-    GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
-    GridService = "OpenSim.Services.GridService.dll:GridService"
-    GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
-    PresenceService	= "OpenSim.Services.PresenceService.dll:PresenceService"
-    FriendsService	= "OpenSim.Services.FriendsService.dll:FriendsService"
-    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GridUserService     = "OpenSim.Services.UserAccountService.dll:GridUserService"
+    GridService         = "OpenSim.Services.GridService.dll:GridService"
+    GatekeeperService   = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
+    FriendsService      = "OpenSim.Services.FriendsService.dll:FriendsService"
+    UserAccountService  = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
     ; If you run this user agent server behind a proxy, set this to true
     ; HasProxy = false
@@ -611,7 +611,7 @@
     ;; Are local users allowed to visit other grids?
     ;; What user level? Use variables of this forrm:
     ;; ForeignTripsAllowed_Level_<UserLevel> = true | false
-	;; (the default is true)
+    ;; (the default is true)
     ;; For example:
     ; ForeignTripsAllowed_Level_0 = false
     ; ForeignTripsAllowed_Level_200 = true ; true is default, no need to say it
@@ -619,16 +619,16 @@
     ;; If ForeignTripsAllowed is false, make exceptions using DisallowExcept
     ;; Leave blank or commented for no exceptions.
     ; DisallowExcept_Level_0 = "http://myothergrid.com:8002, http://boss.com:8002"
-	;;
+    ;;
     ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept.
     ;; Leave blank or commented for no exceptions.
     ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
 
-	;; This variable controls what is exposed to profiles of local users
-	;; as seen from outside of this grid. Leave it uncommented for exposing
-	;; UserTitle, UserFlags and the creation date. Uncomment and change to False
-	;; to block this info from being exposed.
-	; ShowUserDetailsInHGProfile = True
+    ;; This variable controls what is exposed to profiles of local users
+    ;; as seen from outside of this grid. Leave it uncommented for exposing
+    ;; UserTitle, UserFlags and the creation date. Uncomment and change to False
+    ;; to block this info from being exposed.
+    ; ShowUserDetailsInHGProfile = True
 
 
 ; * The interface that local users get when they are in other grids.
@@ -687,10 +687,10 @@
 
 
 [HGInstantMessageService]
-    LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
-    GridService = "OpenSim.Services.GridService.dll:GridService"
-    PresenceService	= "OpenSim.Services.PresenceService.dll:PresenceService"
-    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    LocalServiceModule  = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
+    GridService         = "OpenSim.Services.GridService.dll:GridService"
+    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
+    UserAgentService    = "OpenSim.Services.HypergridService.dll:UserAgentService"
     ; This should always be true in the Robust config
     InGatekeeper = True
 
@@ -718,7 +718,7 @@
     ;; Realm = UserProfiles
     UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService
     AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-	
+
 
 [BakedTextureService]
     LocalServiceModule = "OpenSim.Server.Handlers.dll:XBakes"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 687bb2e538..a0b8f50177 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -89,8 +89,8 @@
     ;; Uncomment for UserProfiles see [UserProfilesService] to configure...
     ; UserProfilesServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:UserProfilesConnector"
 
-	;; Uncomment if you want to have centralized estate data
-	; EstateDataService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:EstateDataRobustConnector"
+    ;; Uncomment if you want to have centralized estate data
+    ; EstateDataService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:EstateDataRobustConnector"
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
@@ -394,20 +394,20 @@
     ; If you run this login server behind a proxy, set this to true
     ; HasProxy = false
 
-	;; Regular expressions for controlling which client versions are accepted/denied.
-	;; An empty string means nothing is checked.
-	;;
-	;; Example 1: allow only these 3 types of clients (any version of them)
-	;; AllowedClients = "Imprudence|Hippo|Second Life"
-	;;
-	;; Example 2: allow all clients except these
-	;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
-	;;
-	;; Note that these are regular expressions, so every character counts.
-	;; Also note that this is very weak security and should not be trusted as a reliable means
-	;; for keeping bad clients out; modified clients can fake their identifiers.
-	;;
-	;;
+    ;; Regular expressions for controlling which client versions are accepted/denied.
+    ;; An empty string means nothing is checked.
+    ;;
+    ;; Example 1: allow only these 3 types of clients (any version of them)
+    ;; AllowedClients = "Imprudence|Hippo|Second Life"
+    ;;
+    ;; Example 2: allow all clients except these
+    ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald"
+    ;;
+    ;; Note that these are regular expressions, so every character counts.
+    ;; Also note that this is very weak security and should not be trusted as a reliable means
+    ;; for keeping bad clients out; modified clients can fake their identifiers.
+    ;;
+    ;;
     ;AllowedClients = ""
     ;DeniedClients = ""
 
@@ -453,13 +453,14 @@
 
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
-	; Set this if you want to change the default
-	; TilesStoragePath = "maptiles"
-	;
-	; If for some reason you have the AddMapTile service outside the firewall (e.g. ${Const|PublicPort}),
-	; you may want to set this. Otherwise, don't set it, because it's already protected.
-	; GridService = "OpenSim.Services.GridService.dll:GridService"
-	;
+
+    ; Set this if you want to change the default
+    ; TilesStoragePath = "maptiles"
+    ;
+    ; If for some reason you have the AddMapTile service outside the firewall (e.g. ${Const|PublicPort}),
+    ; you may want to set this. Otherwise, don't set it, because it's already protected.
+    ; GridService = "OpenSim.Services.GridService.dll:GridService"
+    ;
     ; Additionally, if you run this server behind a proxy, set this to true
     ; HasProxy = false
 
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 42ecec20ff..4b01d8205b 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -8,27 +8,27 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Modules]
-    AssetServices			= "RemoteAssetServicesConnector"
-    InventoryServices		= "RemoteXInventoryServicesConnector"
-    GridServices			= "RemoteGridServicesConnector"
-    AvatarServices			= "RemoteAvatarServicesConnector"
-    NeighbourServices		= "RemoteNeighbourServicesConnector"
-    AuthenticationServices	= "RemoteAuthenticationServicesConnector"
-    AuthorizationServices	= "LocalAuthorizationServicesConnector"
-    PresenceServices		= "RemotePresenceServicesConnector"
-    UserAccountServices		= "RemoteUserAccountServicesConnector"
-    GridUserServices		= "RemoteGridUserServicesConnector"
-    SimulationServices		= "RemoteSimulationConnectorModule"
-    EntityTransferModule	= "BasicEntityTransferModule"
-    InventoryAccessModule	= "BasicInventoryAccessModule"
+    AssetServices           = "RemoteAssetServicesConnector"
+    InventoryServices       = "RemoteXInventoryServicesConnector"
+    GridServices            = "RemoteGridServicesConnector"
+    AvatarServices          = "RemoteAvatarServicesConnector"
+    NeighbourServices       = "RemoteNeighbourServicesConnector"
+    AuthenticationServices  = "RemoteAuthenticationServicesConnector"
+    AuthorizationServices   = "LocalAuthorizationServicesConnector"
+    PresenceServices        = "RemotePresenceServicesConnector"
+    UserAccountServices     = "RemoteUserAccountServicesConnector"
+    GridUserServices        = "RemoteGridUserServicesConnector"
+    SimulationServices      = "RemoteSimulationConnectorModule"
+    EntityTransferModule    = "BasicEntityTransferModule"
+    InventoryAccessModule   = "BasicInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
-    MapImageService			= "MapImageServiceModule"
-    SearchModule			= "BasicSearchModule"
+    MapImageService         = "MapImageServiceModule"
+    SearchModule            = "BasicSearchModule"
     
-    LandServiceInConnector			= true
-    NeighbourServiceInConnector		= true
-    SimulationServiceInConnector	= true
-    LibraryModule					= true
+    LandServiceInConnector        = true
+    NeighbourServiceInConnector   = true
+    SimulationServiceInConnector  = true
+    LibraryModule                 = true
 
 [SimulationService]
     ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
@@ -70,4 +70,4 @@
     Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
 
 [MapImageService]
-	LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 8dc3a73dbb..4486f31cee 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -109,14 +109,14 @@
     Gatekeeper="${Const|BaseURL}:${Const|PublicPort}"
 
 [EstateDataStore]
-	;
-	; Uncomment if you want centralized estate data at robust server,
-	; in which case the URL in [EstateService] will be used
-	;
-	;LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataRemoteConnector"
+    ;
+    ; Uncomment if you want centralized estate data at robust server,
+    ; in which case the URL in [EstateService] will be used
+    ;
+    ;LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataRemoteConnector"
 
 [EstateService]
-	EstateServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
+    EstateServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [Messaging]
     ; === HG ONLY ===
@@ -171,17 +171,17 @@
     Gatekeeper = "${Const|BaseURL}:${Const|PublicPort}"
     ;; If you want to protect your assets from being copied by foreign visitors
     ;; set this to false. You may want to do this on sims that have licensed content.
-	;; Default is true.
+    ;; Default is true.
     ; OutboundPermission = True
 
     ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
     ;; and available when they return. True by default.
     ;RestrictInventoryAccessAbroad = True
 
-	;; Warning: advanced and unusual. Default is false.
-	;; Enables configurations where grids share user services, including inventory,
-	;; while separating regions' assets from users' assets. Asset transfer between 
-	;; the users' asset server and the regions' asset server is done in HG-like manner.
+    ;; Warning: advanced and unusual. Default is false.
+    ;; Enables configurations where grids share user services, including inventory,
+    ;; while separating regions' assets from users' assets. Asset transfer between 
+    ;; the users' asset server and the regions' asset server is done in HG-like manner.
     ; CheckSeparateAssets = false
     ; RegionHGAssetServerURI = ${Const|BaseURL}:${Const|PublicPort}
 
@@ -218,7 +218,7 @@
     UserAgentServerURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 [MapImageService]
-   	MapImageServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
+    MapImageServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [AuthorizationService]
   ; If you have regions with access restrictions
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 8b47ede833..21a5a22d8f 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -8,32 +8,32 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Startup]
-	WorldMapModule = "HGWorldMap"
+    WorldMapModule = "HGWorldMap"
 
 [Modules]
-    AssetServices			= "HGAssetBroker"
-    InventoryServices		= "HGInventoryBroker"
-    GridServices			= "RemoteGridServicesConnector"
-    AvatarServices			= "RemoteAvatarServicesConnector"
-    NeighbourServices		= "RemoteNeighbourServicesConnector"
-    AuthenticationServices	= "RemoteAuthenticationServicesConnector"
-    AuthorizationServices	= "LocalAuthorizationServicesConnector"
-    PresenceServices		= "RemotePresenceServicesConnector"
-    UserAccountServices		= "RemoteUserAccountServicesConnector"
-    GridUserServices		= "RemoteGridUserServicesConnector"
-    SimulationServices		= "RemoteSimulationConnectorModule"
-    EntityTransferModule	= "HGEntityTransferModule"
-    InventoryAccessModule	= "HGInventoryAccessModule"
+    AssetServices           = "HGAssetBroker"
+    InventoryServices       = "HGInventoryBroker"
+    GridServices            = "RemoteGridServicesConnector"
+    AvatarServices          = "RemoteAvatarServicesConnector"
+    NeighbourServices       = "RemoteNeighbourServicesConnector"
+    AuthenticationServices  = "RemoteAuthenticationServicesConnector"
+    AuthorizationServices   = "LocalAuthorizationServicesConnector"
+    PresenceServices        = "RemotePresenceServicesConnector"
+    UserAccountServices     = "RemoteUserAccountServicesConnector"
+    GridUserServices        = "RemoteGridUserServicesConnector"
+    SimulationServices      = "RemoteSimulationConnectorModule"
+    EntityTransferModule    = "HGEntityTransferModule"
+    InventoryAccessModule   = "HGInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
-    FriendsModule			= "HGFriendsModule"
-    MapImageService			= "MapImageServiceModule"
-    UserManagementModule	= "HGUserManagementModule"
-    SearchModule			= "BasicSearchModule"
+    FriendsModule           = "HGFriendsModule"
+    MapImageService         = "MapImageServiceModule"
+    UserManagementModule    = "HGUserManagementModule"
+    SearchModule            = "BasicSearchModule"
     
-    LandServiceInConnector			= true
-    NeighbourServiceInConnector		= true
-    SimulationServiceInConnector	= true
-    LibraryModule					= true
+    LandServiceInConnector        = true
+    NeighbourServiceInConnector   = true
+    SimulationServiceInConnector  = true
+    LibraryModule                 = true
 
 [SimulationService]
     ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
@@ -96,7 +96,7 @@
 [HGInstantMessageService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
     GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector"
-    PresenceService	= "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
+    PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector"
     UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector"
 
 [MapImageService]
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index f561dd5a01..efad5772a3 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -55,7 +55,7 @@
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
     NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
 
-	HypergridLinker = true
+    HypergridLinker = true
     AllowHypergridMapSearch = true
 
 [LibraryService]
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 8e42fab851..5749656231 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -53,7 +53,7 @@
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-	NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
+    NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
 
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -63,7 +63,7 @@
 [AssetService]
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
-	
+
 [Groups]
     Enabled = true
     Module  = GroupsModule
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 398a76c3fd..6b91d9ad13 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -9,7 +9,7 @@
     InventoryServices       = "LocalInventoryServicesConnector"
     NeighbourServices       = "LocalNeighbourServicesConnector"
     AuthenticationServices  = "LocalAuthenticationServicesConnector"
-    AuthorizationServices	= "LocalAuthorizationServicesConnector"
+    AuthorizationServices   = "LocalAuthorizationServicesConnector"
     GridServices            = "LocalGridServicesConnector"
     PresenceServices        = "LocalPresenceServicesConnector"
     UserProfilesServices    = "LocalUserProfilesServicesConnector"
@@ -19,8 +19,8 @@
     AvatarServices          = "LocalAvatarServicesConnector"
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
-    MapImageService			= "MapImageServiceModule"
-    SearchModule			= "BasicSearchModule"
+    MapImageService         = "MapImageServiceModule"
+    SearchModule            = "BasicSearchModule"
 
     LibraryModule              = true
     LLLoginServiceInConnector  = true
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index edccf23a1c..a11a931077 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -271,24 +271,24 @@
     ; uas = ${Const|BaseURL}:${Const|PublicPort}/
 
 [MapImageService]
-	; Set this if you want to change the default
-	; TilesStoragePath = "maptiles"
+    ; Set this if you want to change the default
+    ; TilesStoragePath = "maptiles"
 
 [AuthorizationService]
-	; If you have regions with access restrictions
-	; specify them here using the convention
-	; Region_<Region_Name> = <flags>
-	; Valid flags are:
-	; DisallowForeigners -- HG visitors not allowed
-	; DisallowResidents -- only Admins and Managers allowed
-	; Example:
-	; Region_Test_1 = "DisallowForeigners"
+    ; If you have regions with access restrictions
+    ; specify them here using the convention
+    ; Region_<Region_Name> = <flags>
+    ; Valid flags are:
+    ; DisallowForeigners -- HG visitors not allowed
+    ; DisallowResidents -- only Admins and Managers allowed
+    ; Example:
+    ; Region_Test_1 = "DisallowForeigners"
 
 ;;
 ;; HG configurations
 ;;
 [GatekeeperService]
-	;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
+    ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
     ; ExternalName = "${Const|BaseURL}:${Const|PublicPort}"
 
     ; Does this grid allow incoming links to any region in it?
@@ -344,11 +344,11 @@
     ;; Leave blank or commented for no exceptions.
     ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
 
-	;; This variable controls what is exposed to profiles of local users
-	;; as seen from outside of this grid. Leave it uncommented for exposing
-	;; UserTitle, UserFlags and the creation date. Uncomment and change to False
-	;; to block this info from being exposed.
-	; ShowUserDetailsInHGProfile = True
+    ;; This variable controls what is exposed to profiles of local users
+    ;; as seen from outside of this grid. Leave it uncommented for exposing
+    ;; UserTitle, UserFlags and the creation date. Uncomment and change to False
+    ;; to block this info from being exposed.
+    ; ShowUserDetailsInHGProfile = True
 
 
 [HGInventoryService]
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 102947a713..1be67db6a8 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -8,35 +8,35 @@
     WorldMapModule = "HGWorldMap"
 
 [Modules]
-    AssetServices			= "HGAssetBroker"
-    InventoryServices		= "HGInventoryBroker"
-    NeighbourServices		= "LocalNeighbourServicesConnector"
-    AuthenticationServices	= "LocalAuthenticationServicesConnector"
-    AuthorizationServices	= "LocalAuthorizationServicesConnector"
-    GridServices			= "LocalGridServicesConnector"
-    PresenceServices		= "LocalPresenceServicesConnector"
-    UserAccountServices		= "LocalUserAccountServicesConnector"
+    AssetServices           = "HGAssetBroker"
+    InventoryServices       = "HGInventoryBroker"
+    NeighbourServices       = "LocalNeighbourServicesConnector"
+    AuthenticationServices  = "LocalAuthenticationServicesConnector"
+    AuthorizationServices   = "LocalAuthorizationServicesConnector"
+    GridServices            = "LocalGridServicesConnector"
+    PresenceServices        = "LocalPresenceServicesConnector"
+    UserAccountServices     = "LocalUserAccountServicesConnector"
     GridUserServices        = "LocalGridUserServicesConnector"
-    SimulationServices		= "RemoteSimulationConnectorModule"
-    AvatarServices			= "LocalAvatarServicesConnector"
+    SimulationServices      = "RemoteSimulationConnectorModule"
+    AvatarServices          = "LocalAvatarServicesConnector"
     UserProfilesServices    = "LocalUserProfilesServicesConnector"
-    MapImageService			= "MapImageServiceModule"
-    EntityTransferModule	= "HGEntityTransferModule"
-    InventoryAccessModule	= "HGInventoryAccessModule"
-    FriendsModule			= "HGFriendsModule"
-    UserManagementModule	= "HGUserManagementModule"
-    SearchModule			= "BasicSearchModule"
+    MapImageService         = "MapImageServiceModule"
+    EntityTransferModule    = "HGEntityTransferModule"
+    InventoryAccessModule   = "HGInventoryAccessModule"
+    FriendsModule           = "HGFriendsModule"
+    UserManagementModule    = "HGUserManagementModule"
+    SearchModule            = "BasicSearchModule"
     
-    InventoryServiceInConnector			= true
-    AssetServiceInConnector				= true
-    HypergridServiceInConnector			= true
-    NeighbourServiceInConnector			= true
-    LibraryModule						= true
-    LLLoginServiceInConnector			= true
-    GridInfoServiceInConnector			= true
-    AuthenticationServiceInConnector	= true
-    SimulationServiceInConnector		= true
-    MapImageServiceInConnector			= true
+    InventoryServiceInConnector       = true
+    AssetServiceInConnector           = true
+    HypergridServiceInConnector       = true
+    NeighbourServiceInConnector       = true
+    LibraryModule                     = true
+    LLLoginServiceInConnector         = true
+    GridInfoServiceInConnector        = true
+    AuthenticationServiceInConnector  = true
+    SimulationServiceInConnector      = true
+    MapImageServiceInConnector        = true
 
 [SimulationService]
     ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
@@ -90,13 +90,13 @@
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     Realm = "regions"
     StorageProvider = "OpenSim.Data.Null.dll"
-	
+
     ; Needed to display non-default map tile images for remote regions
     AssetService = "OpenSim.Services.AssetService.dll:AssetService"
   
     HypergridLinker = true
     AllowHypergridMapSearch = true
-	
+
 [PresenceService]
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
     StorageProvider = "OpenSim.Data.Null.dll"
@@ -124,21 +124,21 @@
     Connector = "OpenSim.Services.FriendsService.dll"
 
 [LoginService]
-    LocalServiceModule		= "OpenSim.Services.LLLoginService.dll:LLLoginService"
-    UserAccountService		= "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    GridUserService			= "OpenSim.Services.UserAccountService.dll:GridUserService"
-    UserAgentService		= "OpenSim.Services.HypergridService.dll:UserAgentService"
-    AuthenticationService	= "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    InventoryService		= "OpenSim.Services.InventoryService.dll:XInventoryService"
-    PresenceService			= "OpenSim.Services.PresenceService.dll:PresenceService"
-    GridService				= "OpenSim.Services.GridService.dll:GridService"
-    AvatarService			= "OpenSim.Services.AvatarService.dll:AvatarService"
-    FriendsService			= "OpenSim.Services.FriendsService.dll:FriendsService"
+    LocalServiceModule    = "OpenSim.Services.LLLoginService.dll:LLLoginService"
+    UserAccountService    = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GridUserService       = "OpenSim.Services.UserAccountService.dll:GridUserService"
+    UserAgentService      = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+    InventoryService      = "OpenSim.Services.InventoryService.dll:XInventoryService"
+    PresenceService       = "OpenSim.Services.PresenceService.dll:PresenceService"
+    GridService           = "OpenSim.Services.GridService.dll:GridService"
+    AvatarService         = "OpenSim.Services.AvatarService.dll:AvatarService"
+    FriendsService        = "OpenSim.Services.FriendsService.dll:FriendsService"
    
     ; This inventory service will be used to initialize the user's inventory
     HGInventoryServicePlugin = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService"
     HGInventoryServiceConstructorArg = "HGInventoryService"
-	
+
 [MapImageService]
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
 
@@ -158,15 +158,14 @@
     ;; for the service
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
-    GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
-    PresenceService	= "OpenSim.Services.PresenceService.dll:PresenceService"
-    FriendsService	= "OpenSim.Services.FriendsService.dll:FriendsService"
-    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    GatekeeperService   = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+    PresenceService     = "OpenSim.Services.PresenceService.dll:PresenceService"
+    FriendsService      = "OpenSim.Services.FriendsService.dll:FriendsService"
+    UserAccountService  = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
     ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 to show a default "Ruth" avatar rather than a cloud.
     CreateDefaultAvatarEntries = true
 
-	
 ;; The interface that local users get when they are in other grids
 ;; This greatly restricts the inventory operations while in other grids
 [HGInventoryService]
@@ -198,8 +197,8 @@
 [HGInstantMessageService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
-    PresenceService	= "OpenSim.Services.PresenceService.dll:PresenceService"
-    UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
+    PresenceService   = "OpenSim.Services.PresenceService.dll:PresenceService"
+    UserAgentService  = "OpenSim.Services.HypergridService.dll:UserAgentService"
     InGatekeeper = True
 
 ;; This should always be the very last thing on this file