Making TBB patch apply again.

However, this patch is a problem only for older compilers that implement
overturned TR1 specification. So it is probably not neccessary if we target
c++11.
Passing SWIG on to Trilinos #106
Incorrect variable name
Merge branch 'rsdt/new_build' of github.com:bempp/bempp into rsdt/new_build