minor
ComplexNAIBatch compiles and doesn't break TestSuite
Merge branch 'master' of github.com:shiozaki/BAGEL into gauge

Conflicts:
	src/integral/Makefile.am
	src/integral/rys/coulombbatch_energy.h
	src/integral/rys/coulombbatch_energy_impl.hpp
Make CoulombBatch_Base aware of what type of basis function it's using
Update compute_ss for London orbitals; this definition of P_ should also fix the VRR.

The London orbital NAI should now be correct, but none of it has been tested.
Refactoring of the test code; might as well have the manual input code in the same place
Test code:  Fixing normalization so it works with contracted orbitals
Test code - can compute NAI now (with angular momentum)
Quick fixes
Updated interface for rapid testing of London orbital NAI

This function can be called in hcore.cc to compare data.  Bagel and the test code often give the same results, but not always.  Need to figure out why.
bug fix
bug fix
bug fixes
minor
Merge branch 'master' of github.com:shiozaki/BAGEL into gauge
Also let RysIntegral know what type of functions it's working with.
No reason for CoulombBatch_energy to be a template anymore
Templating OSInt

Not certain this is the best approach since it has many derived classes and two implementation files, but this at least matches the design of RysIntegral and lets us avoid duplication of source code.
Determine which SortList to use in derived classes
Inline the daxpy_ function to allow type flexibility