fixed 2 body problem
put proxy change in other branch
Merge branch 'nictaProxyCache' of https://github.com/NICTA/nationalmap into regionMapTuning
Merge branch 'master' of https://github.com/NICTA/nationalmap into regionMapTuning
Merge branch 'master' of https://github.com/NICTA/nationalmap into regionMapTuning
merge
Merge branch 'master' of https://github.com/NICTA/nationalmap into regionMapTuning
updated to promise model
start on reading the noisy census file format"
Merge branch 'master' of https://github.com/NICTA/nationalmap into regionMapTuning
more region mapping tuning
lint complaints
Merge pull request #468 from NICTA/regionMapTuning

Region map tuning