Merge pull request #756 from bhariharan/master

Updates Windows symlinks
Updating manifest to point to correct icon