Fixed merge conflict
Merge remote-tracking branch 'jdegraaf/bug_hunt' into electrokinetics
Added electrokinetic to features.def
bootstrap.sh can be run from build dir, dielectric.tcl no longer crashes make check, seg fault caused by lack of args in lbnode now checked
new combined bootstrap and configure
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.