First steps of merging electrokinetics into master.  Still lacks interface and not tested
Merge remote-tracking branch 'origin/electrokinetics' into electrokinetics_erge
Cleaned up Owen's combined bootstrap/configure and took it out of .gitignore
Properly separated all electrokinetics changes from other commits during the thesis and found one more change, that was missing so far.
Electrokinetics runs now but only produces NANs.
Changed coding style in electrokinetics and fixed a precompiler guard bug.
Added missing header file.
Finished changing coding style of electrokinetics code.
Solved merge conflicts with Joost's and Dominic's temporary LB fix.
Fixed a bug with the compiler switches. Code seems to work without boundaries. The density initialization with boundaries produces uninitializes density fields.
Code now seems to work. Took out printfs.
Put dielectric test back in.
Added charge to GPU particle communication.
Implemented particle charge interpolation in electrokinetics.
Fixed merge conflicts.
Merge remote-tracking branch 'upstream/master' into electrokinetics_merge
Merge remote-tracking branch 'upstream/master' into electrokinetics_merge_master
small fix to iccp3m and pore dielectric
fixed little numerical instability in dielectric pore and added

external field to iccp3m again
Merge branch 'master' into kessel_master2

Conflicts:
	scripts/dielectrics.tcl
	src/iccp3m.c