Included a timeout feature in both scraper.py and parser.py

parser.py:
- added import urllib2
- changed line 21 to urllib2.urlopen(url, timeout=60)

scraper.py:
- added self.timeout attribute to Scraper class (default 600)
- added timeout=self.timeout param to line 194
- added a --timeout flag to CLI