Typed the function for modular forms minus epsilon. Needs checking
Merge branch 'mine' of http://github.com/categorie/lmfdb into minealberto

Conflicts:
	lmfdb/tensor_products/galois_reps.py
Finished implementing the thingy for Elliptic Modular Forms
Merge branch 'mine' of https://github.com/categorie/lmfdb into minealberto

Conflicts:
	lmfdb/tensor_products/galois_reps.py
Merge branch 'master' of http://github.com/MarkWatkins2014/lmfdb into mine

* 'master' of http://github.com/MarkWatkins2014/lmfdb:
  Change to LMFDB normalisation with middle homology
add hypothesis
move dir coeffs
added direct function for convolving Euler factors
make the new tensor_local_factors() work