Fixes error in geodetic formula
Completes windows installation instructions
Fixes conflicts with master
Merge pull request #5 from g-weatherill/update_14112013

Updates Windows installation description + Minor Fixes