Copied in the newest code for main.js

Moved pieces back up from comments and then tried to follow D3 guide to
get map to work. No syntax errors but map not showing up
Library problem fixed

moved libraries into correct placement to remove corresponding syntax
errors
minor fix