Merge pull request #22 from Circuitscape/parallel

profiling improvements. refer #12
Merge pull request #23 from Circuitscape/parallel

handle unavailability of resource module on windows
Revert "Small improvements to the amg_hierarchy. Use splu direct solver and"

This reverts commit c72efbe7edc3a64afbf06d52da735d13c644c5b7.
Merge branch 'master' of github.com:ViralBShah/Circuitscape
wxversion select tweaked for windows