Merge branch 'fsharp' of git://github.com/thoughtpolice/nixpkgs

fsharp: Upgrade to fsharp-3.0

[ Shea: I'm merging thoughtpolice's commits without further testing
beyond code inspection, as I believe their work has proven itself ]