Lots of good stuff!!
Merge branch 'develop' of https://github.com/darrina/scripts into develop

Conflicts:
	.gitconfig
	.gitignore
	.vimrc
	Documents/WindowsPowershell/Modules/Autoload/Autoload.psm1
	Documents/WindowsPowershell/Modules/Development/Development.psm1
	Documents/WindowsPowershell/Modules/Functional/Functional.psm1
	Documents/WindowsPowershell/Modules/IIS/IIS.psm1
	Documents/WindowsPowershell/Modules/Linq/Linq.psm1
	Documents/WindowsPowershell/Modules/MsBuild/MsBuild.psm1
	Documents/WindowsPowershell/Modules/MyProgramming/MyProgramming.psm1
	Documents/WindowsPowershell/Modules/MyRegistry/MyRegistry.psm1
	Documents/WindowsPowershell/Modules/Network/Network.psm1
	Documents/WindowsPowershell/Modules/PSExtentions/PSExtensions.psm1
	Documents/WindowsPowershell/Modules/PoshCode/PoshCode.psm1
	Documents/WindowsPowershell/Modules/PoshCode/poshcode.3.13.psm1
	Documents/WindowsPowershell/Modules/PoshGit/PoshGit.psm1
	Documents/WindowsPowershell/Modules/PowerReport/PowerReport.psm1
	Documents/WindowsPowershell/Modules/Reflection/Reflection.psd1
	Documents/WindowsPowershell/Modules/Reflection/Reflection.psm1
	Documents/WindowsPowershell/Modules/ReverseScroll/ReverseScroll.psm1
	Documents/WindowsPowershell/Modules/SharePoint2010/SharePoint2010.psm1
	Documents/WindowsPowershell/Modules/SharePoint2013/SharePoint2013.psm1
	Documents/WindowsPowershell/Modules/SysInternals/SysInternals.psm1
	Documents/WindowsPowershell/Modules/Utilities/Utilities.psm1
	Documents/WindowsPowershell/Modules/Web/Web.psm1
	Documents/WindowsPowershell/Modules/WebGet/WebGet.psm1
	Documents/WindowsPowershell/Modules/Windows/Windows.psm1
	Legacy/Disable-LockScreen.reg
	Legacy/Disable_Iastor_LowPowerMode.reg
	Legacy/Disable_Loopback.reg
	Legacy/Enable-LockScreen.reg
	Legacy/Enable-WindowsUpdate.reg
	Legacy/EnableFlash/EnableFlash.cmd
	Legacy/EnableFlash/SetFlashRegPerms.cmd
	Legacy/Enable_ICS_Internet_Connection_System.reg
	Legacy/Fix-SkyDriveSync.ps1
	Legacy/Get-AssemblyConflicts.ps1
	Legacy/Get-ListeningProcesses.ps1
	Legacy/Get-ServerInventory.ps1
	Legacy/Increase WebDave File Transfer Limit.reg
	Legacy/MountVHD/MountVHD - Task.xml
	Legacy/MountVHD/MountVHD.dps
	Legacy/NewItemsUseDefaultSendingAccount-2013.reg
	Legacy/OrgDiff/Get-OrgChart.ps1
	Legacy/OrgDiff/Update-OrgDiff.ps1
	Legacy/OrgDiff/readme.txt
	Legacy/Redirect-IISExpress-Home.reg
	Legacy/Reset-GPKerbDA.ps1
	Legacy/Reset-Home.reg
	Legacy/Reset-ProxyCache.ps1
	Legacy/Restore_Default_Folder_Templates.bat
	Legacy/Set-DNSServerSearchOrder.ps1
	Legacy/SharePoint2013WebFormManipulate.js
	Legacy/Surface Display Four Tile Rows Tweak.reg
	Legacy/XPerf Task.xml