Merge pull request #10 from mashcode/gh-pages

reorganized the jekyll dev page
add python scraper, work in progress
Merge branch 'master' into gh-pages
Add combine.py, meant to do all comining in one, work in progress
Merge branch 'master' into gh-pages
Updating python scraper
Renaming folder for php scraper
Merge branch 'master' into gh-pages
PEP8 changes

Adjusted to follow PEP8 guidelines (http://legacy.python.org/dev/peps/pep-0008/).

Formatted spacing -> 4 space indentation: http://legacy.python.org/dev/peps/pep-0008/#indentation
Condensed the lxml import into one line: http://legacy.python.org/dev/peps/pep-0008/#imports
Merge pull request #13 from jasondecastro/patch-1

PEP8 changes
Update python scraper
merge scraper file from master
Using spaces not tabs (PEP8)
Using spaces not tabs (PEP8)
Finalizing python scraper
Finalizing python scraper
Saving old function specifically for output files of ruby scraper
PEP8
Updated combine function
New data