editz master
editz

file:a/index.md -> file:b/index.md
--- a/index.md
+++ b/index.md
@@ -11,14 +11,15 @@
 ## Preparing your submission
 
 You should record a 3 minute speech and mix images/text to accompany.
-http://www.screenr.com/ and other screencasting tools allow you to demo apps.
+[Screenr] (http://www.screenr.com/) , [ActivePresenter Free Edition](http://atomisystems.com/activepresenter/free-edition/) and other screencasting tools allow you to demo apps.
 To mix together clips, you can use youtube video editor http://www.youtube.com/editor or local software like http://www.videolan.org/vlmc/ or http://www.lwks.com/
+You can use graphics for example [storyboards with these free icons](http://dribbble.com/shots/1083617-430-FREE-storyboard-illustrations)
 
 You also need to submit your "source material". For an application this may be source code, for another work it might be your notes or prototypes.
 The key thing here is that your source material demonstrates to the judges that some of the end result was your own work and that it is possible for another person to replicate that work.
 
 
-# General References {#general-data-hacking-and-programming-references}
+# General References
 
 
 ## The basics of being a data scientist
@@ -58,7 +59,7 @@
 
 
 
-# Developer Tools For Your Computer {#developer-tools-for-your-computer}
+# Developer Tools For Your Computer
 No matter what kind of application you have for the data, there are many tools you can use to better collaborate and manage your project.
 
 ### Source Control 
@@ -66,7 +67,7 @@
 
 [![](img/Screenshot-at-2012-04-29-172132-300x235.png "Git Screenshot")](http://progit.org/book/)
 
-There are [tutorials on git](http://progit.org/book/) and [GUIs to help you](http://code.google.com/p/tortoisegit/)
+There are [tutorials on git](http://progit.org/book/) and GUIs to help you like [TortoiseGit for Windows](http://code.google.com/p/tortoisegit/) and [Atlassian SourceTree for Windows and OSX](http://sourcetreeapp.com/) (or if you prefer the console [tig](http://blogs.atlassian.com/2013/05/git-tig/))
 There is also a [manual for Subversion](http://svnbook.red-bean.com/) and a [similar GUI for Subversion](http://tortoisesvn.net/)
 
 
@@ -76,12 +77,18 @@
 
 [Trello](https://trello.com/) and [Workflowy](https://workflowy.com/) are free, lightweight project management tools suitable for a rapid project!
 
-## Hosted Developer Tools {#hosted-developer-tools}
+## Virtual Servers
+Many free services to try out virtual/cloud servers before scaling up: https://www.chunkhost.com/ or heroku or https://www.appfog.com/pricing/
+If your wifi starts to get congested, you can use [mosh](http://mosh.mit.edu/) to improve the performance of SSH under reduced network performance.
+
+
+## Hosted Developer Tools
 
 Can get many tools (source control, issue tracking) combined into one service cloud hosted so there's no setup required.
 
-### Github
-Git obviously but svn/hg interfaces are also available. Provide their own GUI for Windows/OSX or use a variety of Git capable tools
+### Github / BitBucket
+Github provides Git but [Subversion (svn)](https://github.com/blog/626-announcing-svn-support) and [Mercurial (hg)](http://hg-git.github.io/) interfaces are also available. Github provide their own GUI for Windows/OSX or you can use a variety of Git capable tools https://github.com/
+Similarly Atlassian provide BitBucket accessible via Git and Mercurial (hg) https://bitbucket.org/
 
 ### Sourceforge
 
@@ -98,11 +105,10 @@
 
 # Applications of data hacking
 
-## API Development {#api-development}
-
-
-So an API isn't just an XML file ![;)](http://www.govhack.org/wp-includes/images/smilies/icon_wink.gif) 
-
+## API Development
+
+
+So an API isn't just an XML file!
 A good web based data API:
 
 *   Is logically organised
@@ -126,7 +132,7 @@
 For example [Stripe's API](http://amberonrails.com/building-stripes-api/) or previous GovHack entrant [WeatheredOak](http://www.govhack.org/2012/06/02/weatheredoak/)
 
 
-## Infographics and Data Visualisation {#data-visualisation}
+## Infographics and Data Visualisation
 
 Infographics try to contextualise charts and graphs to tell a story. Data vis builds on this to find new ways to design insight.
 
@@ -139,8 +145,8 @@
                - http://selection.datavisualization.ch/ data viz tools catalog
 Also check out [http://thejit.org](http://thejit.org/) &amp; [http://www.senchalabs.org/<wbr>philogl/</wbr>](http://www.senchalabs.org/philogl/) (contributed by Matt Adcock)
 
-A good infographic should use visual art concepts and [good color schemes](http://www.r-bloggers.com/the-paul-tol-21-color-salute/)
-For more information on the theory of data visualisation check out the [Stanford CS448B notes](https://graphics.stanford.edu/wikis/cs448b-12-fall/)
+A good infographic should use visual art concepts and [good color schemes](http://www.r-bloggers.com/the-paul-tol-21-color-salute/). See the [data visualisation guidelines from the international journalism festival](http://schoolofdata.org/2013/04/26/data-visualization-guidelines-by-gregor-aisch-international-journalism-festival/)
+For more information on the theory of data visualisation check out the [Stanford CS448B notes](https://graphics.stanford.edu/wikis/cs448b-12-fall/) or [The Ultimate Collection of Data Storytelling Resources](http://www.juiceanalytics.com/writing/the-ultimate-collection-of-data-storytelling-resources/)
 
 Some examples of data visualisation can be seen on [the Sunlight Foundation tumblr](http://sunfoundation.tumblr.com/) or at the GovHack alumn [The Open Budget](http://www/.theopenbudget.org)
 
@@ -207,13 +213,15 @@
 NZ Gov budget http://www.treasury.govt.nz/budget/app
 
 
-# Geographical Data Tools {#geographical-data-tools}
+# Geographical Data Tools
 
 Check out the [GeoRabble Boundary Mapper's Cookbook](http://georabble.org/2012/05/31/the-boundary-mappers-cookbook/) to see how you can tie all these things together!
 
 
 ## Key datasets
 There are a variety of base layers like AGRI aerial imagery of Australia http://agri.openstreetmap.org/ or WMS services like http://irs.gis-lab.info/ wms or http://www.gdal.org/frmt_wms_openstreetmap_tms.xml
+
+Check out the [Geoscience Australia Geo Dataset search and preview](http://www.ga.gov.au/search/index.html#/showMap)
 
 ASGS from ABS including suburbs/postcodes andrewharvey4.wordpress.com postgis/asgs tutorial
 You can also get KML layers for various statistical measures on the ABS TableBuilder tool.
@@ -225,12 +233,18 @@
 You can convert spatial datasets online with http://converter.mygeodata.eu/vector or locally using GDAL (which better for >10 megabyte datasets)
 
 ### Geocoding
-Google Maps APIs allow you to convert an address to map co-ordinates (geocoding) but you must display on a Google Map. The easiest way to do is with a Google Spreadsheet/Fusion Table http://williamparry.blogspot.com.au/2011/04/putting-data-into-google-fusion-tables.htm http://support.google.com/fusiontables/answer/1012281?hl=en&ref_topic=2592806
+
+See this [introduction to geocoding](http://schoolofdata.org/2013/02/19/geocoding-part-i-introduction-to-geocoding/)
+
+Google Maps APIs allow you to convert an address to map co-ordinates (geocoding) but you must display on a Google Map. The easiest way to do is with a Google Spreadsheet/Fusion Table http://schoolofdata.org/2013/02/19/geocoding-part-ii-geocoding-data-in-a-google-docs-spreadsheet/
 
 If you need geocoding for more than display (working out the distance between points etc) or you don't want to use Google Maps, Cloudmade offers free OpenStreetMap based geocoding http://developers.cloudmade.com/projects/show/geocoding-http-api
 
 ## Analysis
 
+### R
+http://www.r-bloggers.com/starting-analysis-and-visualisation-of-spatial-data-with-r/
+http://www.r-bloggers.com/3d-mapping-in-r/
 
 ### PostGIS
 
@@ -239,6 +253,8 @@
 ### Quantum GIS
 
 [![](img/How-to-participate-in-GovHack_html_m50afbe88-300x160.jpg "QGIS Screenshot")](img/How-to-participate-in-GovHack_html_m50afbe88.jpg)QGIS is a graphical desktop application that allows viewing and editing of geospatial data. Some good base maps are available by adding the WMS layer/server [http://irs.gis-lab.info/](http://irs.gis-lab.info/)
+
+See this [Creating a Map in QGIS tutorial](http://schoolofdata.org/2013/04/27/creating-a-map-using-qgis/)
 
 ## Visualisation
 
@@ -270,18 +286,36 @@
 
 ### 
 
-# Tabular Data Tools {#tabular-data-tools}
+# Tabular Data Tools
 
 ## Wrangling
 
+### data access
+#### Relational IO platform
+
+- Datasets from the new data.gov.au CKAN repository
+- Datasets from data.act.gov.au Socrata repository
+- Access to NLAs Trove API
+- Select data from data.nsw.gov.au (csv based)
+- Datasets from data.vic.gov.au (csv based)
+- Datasets from data.qld.gov.au (csv based)
+- Access to web services such as Flickr image search, Twitter Search API, Bing search API, Google Search API, Google geocoding, Textrazor language analysis.
+
+Teams will get their own read-only SQL-powered workspace that will give them access to all the above datasets / services allowing them to join and mashup data quickly and easily.
+
+
+### conversion
 Converting between formats like json/xml or csv can be done online with http://shancarter.com/data_converter/
 
-Tabular data may have duplicate entries or incorrect formats (varying ways to enter dates/phonenumbers etc.). There are tools to quickly fix common problems
+### correction
+Tabular data may have duplicate entries or incorrect formats (varying ways to enter dates/phonenumbers etc.). There are tools to quickly fix common problems:
 
 [DataWrangler](http://vis.stanford.edu/wrangler/)/[Google Refine](http://code.google.com/p/google-refine/)
 
 [![](img/google_refine_interface.png "google_refine_interface")](img/google_refine_interface.png)Clean up duplicate or inconsistent data entries.
 
+For the more adventureous, [Dedupe](https://github.com/open-city/dedupe) allows you to train a computer to deduplicate similarly named entities automatically.
+
 You can also use general purpose file manipulation tools like grep/awk/sed. These work best when you instruct them what search/change you need using Regular Expressions (RegEx) which you can learn more about at http://www.regexper.com/ and http://www.debuggex.com/?re=&str=
 
 ## Analysis
@@ -290,20 +324,25 @@
 
 Great basic analysis and viewing but older versions can be limited to 6500 rows. Eg [http://www.tcij.org/training-material/car/data-mining/3474](http://www.tcij.org/training-material/car/data-mining/3474) or [http://training.sunlightfoundation.com/module/data-visualizations-google-docs/](http://training.sunlightfoundation.com/module/data-visualizations-google-docs/)
 
+ See this [Excel Data Journalism tutorial](http://schoolofdata.org/2013/04/24/using-excel-to-do-precision-journalism-an-update-from-the-school-of-data-journalism-in-perugia/) or [Excel addons for enhanced visualisation and analysis](http://www.clickz.com/clickz/column/2265548/5-free-excel-addins-to-help-digital-marketers-decipher-big-data)
+
 ### PostgreSQL/MySQL
 
 [![](img/How-to-participate-in-GovHack_html_209ee972.jpg "SQL screenshot")](img/How-to-participate-in-GovHack_html_209ee972.jpg)Next step up, large datasets can be manipulated/extracted efficiently for example [http://www.postgresql.org/docs/8.4/static/tutorial-window.html](http://www.postgresql.org/docs/8.4/static/tutorial-window.html) , no built-in data visualisation though.
 
+See this [SQL for lightweight data analysis tutorial](http://schoolofdata.org/2013/03/26/using-sql-for-lightweight-data-analysis/)
+
 ### R Statistical Language
 
 [![](img/rstudio-windows-300x249.png "rstudio-windows")](img/rstudio-windows.png)
-R provides a platform for advanced data analysis which can find and visualise trends even in large datasets. Some reference resources to learn the language [http://cran.r-project.org/doc/manuals/R-intro.html ](http://cran.r-project.org/doc/manuals/R-intro.html)There are also some addons that provide graphical interfaces that make it easier to use such as Rattle [http://rattle.togaware.com/](http://rattle.togaware.com/) , RStudio [http://rstudio.org/](http://rstudio.org/) or Deducer [http://www.deducer.org/pmwiki/pmwiki.php?n=Main.DeducerManual](http://www.deducer.org/pmwiki/pmwiki.php?n=Main.DeducerManual)
+R provides a platform for advanced data analysis which can find and visualise trends even in large datasets. Some reference resources to learn the language [R basic statistics and graphs](https://people.ifm.liu.se/marjon/R_intro_solutions.pdf) [http://cran.r-project.org/doc/manuals/R-intro.html ](http://cran.r-project.org/doc/manuals/R-intro.html) [Guerilla Guide to R](http://www.r-bloggers.com/the-guerilla-guide-to-r/)
+There are also some addons that provide graphical interfaces that make it easier to use such as Rattle [http://rattle.togaware.com/](http://rattle.togaware.com/) , RStudio [http://rstudio.org/](http://rstudio.org/) or Deducer [http://www.deducer.org/pmwiki/pmwiki.php?n=Main.DeducerManual](http://www.deducer.org/pmwiki/pmwiki.php?n=Main.DeducerManual)
 
   R's value lies in the wide array of libraries and addons you can use. For example [BigVis](http://blog.revolutionanalytics.com/2013/04/visualize-large-data-sets-with-the-bigvis-package.html) lets you visualise 10 Million data points in 5 seconds on an ordinary computer.
   Be sure to checkout the list of ["10 R packages I wish I knew about earlier"](http://blog.yhathq.com/puosts/10-R-packages-I-wish-I-knew-about-earlier.html)
 
 ggplot2 is the typical graphical output of R and is very powerful. See these tutorials for instructions: http://chartsnthings.tumblr.com/post/36978271916/r-tutorial-simple-charts http://flowingdata.com/2012/12/17/getting-started-with-charts-in-r/
-You can do some very creative plotting for example [putting pictures of Pokemon where their power level is on an X/Y axis](http://www.r-bloggers.com/to-plot-them-is-my-real-test/)
+You can do some very creative plotting for example [putting pictures of Pokemon where their power level is on an X/Y axis](http://www.r-bloggers.com/to-plot-them-is-my-real-test/) or [a 2D plot with histograms for each dimension](http://www.r-bloggers.com/2d-plot-with-histograms-for-each-dimension-2013-edition/)
 
 To share your analysis with the world you can use [KnittR](http://yihui.name/knitr/) which to make reports. These can include google widgets/charts/maps with the [googlevis](http://www.r-bloggers.com/googlevis-0-3-2-is-released-better-integration-with-knitr/) package.
 
@@ -315,9 +354,14 @@
 
 ## Visualisation
 
-### [Tableau Desktop](http://www.tableausoftware.com/)
-
+### WYSIWYG visualisation tools
+
+[Tableau Desktop](http://www.tableausoftware.com/)
 Create visualisations from various data formats by dragging and dropping. Free trial available on website. [![](img/Tableau-Screenshot-300x190.jpg "Tableau Screenshot")](img/Tableau-Screenshot.jpg)
+
+See this [Tableau Desktop Tutorial](http://schoolofdata.org/2013/04/27/ddjschool-tutorial-analysing-datasets-with-tableau-public/)
+
+There are also web based tools like [plot.ly](http://plot.ly) and [infogr.am](http://infogr.am)
 
 ### Web page (Javascript) graphs
 [Flotr2](http://www.humblesoftware.com/flotr2/)/[Google Chart Tools](https://developers.google.com/chart/)
@@ -330,10 +374,9 @@
 See these tutorials to get started: http://datadrivenjournalism.net/resources/data_driven_documents_defined http://bost.ocks.org/mike/chart/
 
 
-### Processing.js
-
 # Unstructured (Text) Data Tools
 Most of the world's data isn't structured because it is contained in documents (webpages, tweets etc.). Sometimes it is possible to structure it, sometimes there are tools that are better suited it unstructured data.
+[Text analysis can be very valuable for transparency](http://overview.ap.org/blog/2013/05/video-text-analysis-in-transparency/)
 ## Wrangling
 For extracting data from webpages, checkout Scraperwiki pytemplate scrapy
 
@@ -342,8 +385,9 @@
 If there is no way to form a table structure to be able to apply tabular data techniques , you need a more sophisticated analysis as detailed below.
 
 ## Analysing
-Natural Language Processing libraries like OpenNLP for Java or NLTK / [Pattern](https://github.com/clips/pattern) for Python allow you to extract information from text.
-One of the most useful techniques found in these libraries is Named entity recognition which extracts the subjects named in a piece of text.
+Natural Language Processing libraries like OpenNLP for Java or NLTK / [Pattern](https://github.com/clips/pattern) for Python allow you to extract information from text. For example, [finding the important keywords in a sentence automatically](http://thetokenizer.com/2013/05/09/efficient-way-to-extract-the-main-topics-of-a-sentence/)
+
+One of the most useful techniques found in these libraries is Named entity recognition which extracts the subjects named in a piece of text. You can find online services that will interpret text for you without having to install any libraries or write any code such as [Yahoo Content Analysis](http://developer.yahoo.com/contentanalysis/) or [TextRazor](http://www.textrazor.com/).
     
 A search engine just for your dataset can also help. Tools like Apache Lucene/Solr or ElasticSearch can help you index and search large datasets in new ways.
     
@@ -359,20 +403,21 @@
 
 
 
-# Graph (relationships and networks) Data Tools {#graph-relationships-and-networks-data-tools}
+# Graph (relationships and networks) Data Tools
 Graph data can be very valuable for finding communities, hubs and connections between entities (the 6 degrees of separation). This is through the techniques of Social Network Analysis.
 
+You can also find "linked data", [tools for use are listed here](http://logd.tw.rpi.edu/tools_technologies) as well as [sgvizler](http://code.google.com/p/sgvizler/) for sparql graphing, [RelFinder for RDF exploration](http://www.visualdataweb.org/relfinder.php) and [Flint SPARQL editor](http://openuplabs.tso.co.uk/demos/sparqleditor). For more linked data tools, see the [govcamp useful tools wiki](http://govcampau.wikispaces.com/useful+tools)
+
 ## Analysis
 
 ### R
-http://www.slideshare.net/ianmcook/social-network-analysis-in-r
-- http://is-r.tumblr.com/post/38240018815/making-prettier-network-graphs-with-sna-and-igraph
+R statistical language can be used for social network analysis too http://www.slideshare.net/ianmcook/social-network-analysis-in-r http://is-r.tumblr.com/post/38240018815/making-prettier-network-graphs-with-sna-and-igraph
 
 
 ### Graph Databases
 
 [![](img/webadmin-data-300x127.png "Neo4\. web admin screenshot")](img/webadmin-data.png)Help understand relationships - how is X connected to Y and via what other entities they both are connected to.
-Imports and exports can be done by [writing a java program](http://www.slideshare.net/maxdemarzi/etl-into-neo4j) or [spreadsheet](http://blog.neo4j.org/2013/03/importing-data-into-neo4j-spreadsheet.html)
+Imports and exports can be done by [writing a java program](http://www.slideshare.net/maxdemarzi/etl-into-neo4j) or [spreadsheet](http://blog.neo4j.org/2013/03/importing-data-into-neo4j-spreadsheet.html) (for example, [Gmail contacts](http://blog.neo4j.org/2013/04/gmail-email-analysis-with-neo4j-and_24.html)). The fastest way to import data into Neo4j is the [REST batch import API](http://docs.neo4j.org/chunked/milestone/rest-api-batch-ops.html)
 
 There are other graph databases worth considering like [OrientDB](http://www.orientdb.org/) or [Titan](http://thinkaurelius.github.com/titan/)
 Major graph databases like these can be accessed using a common syntax called Gremlin or by writing a simple Java/Python/Ruby application. Queries can be tested in the built in data browser.
@@ -385,7 +430,7 @@
 
 NetworkX is a social network analysis library for python. Many advanced analyses built in like finding communities within a graph. Also good for converting data into graphs.
 
-See this [introduction to Social Network Analysis with NetworkX](http://www.cl.cam.ac.uk/~cm542/teaching/2011/stna-pdfs/stna-lecture11.pdf)
+See this [introduction to Social Network Analysis with NetworkX](http://www.cl.cam.ac.uk/~cm542/teaching/2011/stnapdfs/stna-lecture11.pdf)
 
 
 ## Visualisation
@@ -398,8 +443,12 @@
 You can run [TreeViz](http://www.randelshofer.ch/treeviz/) locally or use [d3 on a website](http://bl.ocks.org/mbostock/4063550), [step by step instructions for creating tree data for d3](http://blog.pixelingene.com/2011/07/building-a-tree-diagram-in-d3-js/)
 d3 also includes [treemaps - bubbles inside bubbles](http://bl.ocks.org/mbostock/4063530)
 
+### Flow Visualisations
+Sometimes it's more about the magnitude (money? amount of communication?) of the connections between nodes.
+A sankey diagram can easily visualise this http://bost.ocks.org/mike/sankey/
+
 ### NodeXL for Microsoft Excel
-[![](img/ExcelWindow.png "NodeXL Screenshot")](img/ExcelWindow.png)
+
  [NodeXL](http://nodexl.codeplex.com/) allows you to visualise networks/graphs quickly inside Excel.
 
 ### [Graphviz](http://www.graphviz.org/)
@@ -409,9 +458,16 @@
 ### Gephi
 
 [![](img/How-to-participate-in-GovHack_html_74d01d05-300x195.jpg "Gephi Screenshot")](img/How-to-participate-in-GovHack_html_74d01d05.jpg)Desktop graph editor and renderer. Many good automatic layout algorithms even for very large graphs.
+
+Many tools can produce input files for Gephi including Graph Databases and [a Excel Spreadsheet to map twitter social networks](http://dfreelon.org/2013/04/26/spreadsheet-converts-tweets-for-social-network-analysis-in-gephi/)
+
+If you need to distribute or customise Gephi-like functionality [Cytoscape](http://www.cytoscape.org/) provides a framework (looks much like Gephi user interface) to develop advanced interactive network visualisations in Java, including filtering and clustering.
 
 ### [sigma.js](http://sigmajs.org/)
 
 [![](img/How-to-participate-in-GovHack_html_m6006eaf3-300x130.jpg "Sigma.js Screenshot")](img/How-to-participate-in-GovHack_html_m6006eaf3.jpg)Javascript graph viewer for displaying graphs on webpages without any other plugins/applications required. It can use GEXF files exported from tools like neo4j, gephi or NetworkX.
  It's also possible to [filter/search the displayed network in sigma.js](https://github.com/jacomyal/osdc2012-sigmajs-demo)
 
+[Cytoscape.js](https://github.com/cytoscape/cytoscape.js) can also be used for interactive web-based network visualisation.
+
+

file:a/index.php -> file:b/index.php
--- a/index.php
+++ b/index.php
@@ -1,3 +1,10 @@
+<?php
+$wordpress = false;
+if (isset($_REQUEST["wordpress"])) $wordpress = true;
+
+if (!$wordpress) {
+
+?>
 <!DOCTYPE html>
 <!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
 <!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
@@ -26,8 +33,22 @@
         <div id="wrapper">
         <section>
 <?php
+}
 include_once "php-markdown/markdown.php";
-echo str_replace("</div><div><h1>GovHack","<div><h1>GovHack",str_replace("<h1>","</div><div><h1>",Markdown(file_get_contents("index.md"))));
+$content = Markdown(file_get_contents("index.md"));
+$content = str_replace("<h1","</div><div><h1",$content);
+$content = str_replace("</div><div><h1>GovHack","<div><h1>GovHack",$content);
+$content .= "</div>";
+if ($wordpress) {
+    $content = str_replace("<div><h1>","<div>[toggle title=\"",$content);
+    $content = str_replace("</div>","[/toggle]</div>",$content);
+    $content = str_replace("</h1>","\"]",$content);
+
+    $content = str_replace("<img","<img width=\"300\" class=\"alignright size-medium\"",$content);
+    $content = str_replace("img/","http://www.govhack.org/wp-content/uploads/",$content);
+}
+echo  $content;
+if (!$wordpress) {
 ?>
 </div>
         </section>
@@ -58,4 +79,6 @@
         </script>
     </body>
 </html>
-
+<?php
+}
+?>

directory:a/js/toc -> directory:b/js/toc
--- a/js/toc
+++ b/js/toc