Merge remote-tracking branch 'bitbucket/master'
updated scraper
merged master
Merge remote-tracking branch 'bitbucket/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Make tiles readable on retina devices
Merge branch 'master' of github.com:trailbehind/iBurn-2011