Update parse.py

bug in parse annot
merge
changed ldsc to ldscore
Merge branch 'master' of https://github.com/bulik/ldsc

Conflicts:
	ldsc.py
fixed bivariate point normal

also fixed a small bug in line 268 of parse.py, and two small changes
in ldsc.py
Update ldsc.py

fixed small bug in return from gencor in ldsc.sumstats
Merge branch 'cts_bin'

Conflicts:
	ldsc.py
	ldscore/parse.py
Merge branch 'dev'
Merge branch 'dev'
added --overlap-annot
new --ref-ld-list flag