Move scripts to the bottom of the page.
Fix conflicts.
Merge branch 'master' of github.com:ekmartin/Tacnet

Merge tacsketch and master.