Udpated with few more changes

Updated to include proper forms for Oracle, Java, Android, win[dows](n) => Windows [n], apostrophes, plz halp no more!
Fixed corrections for "Windows"

The original intent was to connect short form of Windows(win/win xp/win 7 etc to Windows XP/Windows 7), but the regex wasn't well formed and would replace win in any word - this should fix it.
Merge pull request #35 from SathyaBhat/patch-1

Thanks!