Merge branch 'master' into incgamma-c
added .html to .gitignore
Merge branch 'linear_algebra' into parallel
Fixed the nogil definitions and changed notation in all files to use the same mpfr and mpc variables, e.g. mpfr_rnd_t and mpfr_prec_t
Merge branch 'linear_algebra' into parallel

Conflicts:

	psage/matrix/linalg_complex_dense.pxd
	psage/matrix/linalg_complex_dense.pyx
	psage/matrix/matrix_complex_dense.pxd
	psage/matrix/matrix_complex_dense.pyx
	psage/modules/vector_complex_dense.pxd
	psage/rings/mpfr_nogil.pxd
Revert "Merge branch 'hotfix' of https://github.com/fredstro/psage into linear_algebra"

This reverts commit 468820daa31ca4725c1981be065652ab439c6665, reversing
changes made to b4bf5b198fafed13279b14da98cb6f6c9e77cc70.
Merge branch 'incgamma-c' into parallel
Fixed segfault in vv-harmonic weak Maass forms of non-prime discriminants
Added some imports in setup and added interface to parallel stuff in maass_forms_alg
Accidentally touched this file (at least I can't see what I did...)
Working a bit with the interfaces
No real changes in Hilbert code. I was just testing some emacs stuff
Added parallel routines for Maass waveforms
Merge branch 'parallel' of github.com:fredstro/psage into parallel
This merge is probably not necessary...
Added imports
Trying to fix imports...
fixing imports
fixing imports again
Added import for zfunctions
Working on maass forms with non-zero weight