All commits listed above, with the execption of the "while" stuff on pbc

commit 3708ff55d9987803182a7703874d2bbb1d1a3e3e
Merge: fc5ca30 9cab511f
Author: Michele Ceriotti <michele.ceriott@epfl.ch>
Date:   Fri Mar 13 16:45:04 2015 +0100

    Merge branch 'master' into fccubic

commit 9cab511f
Merge: c77549c7 76abc96b
Author: Michele Ceriotti <michele.ceriott@epfl.ch>
Date:   Fri Mar 13 16:43:29 2015 +0100

    Merge branch 'master' of github.com:plumed/plumed2

    Conflicts:
    	src/core/Atoms.cpp
    	src/core/Atoms.h

commit c77549c7
Author: Michele Ceriotti <michele.ceriott@epfl.ch>
Date:   Fri Mar 13 16:27:39 2015 +0100

    Gareth fix for LAMMPS

commit fc5ca30d2b0dd2bed2ead4866317503576e46cd6
Author: Michele Ceriotti <michele.ceriotti@gmail.com>
Date:   Sat Feb 7 18:19:58 2015 +0100

    S**t wrong sign of displacement vector!!

commit 02fa9e6439eb33ac98c26bc46b7950583b3abaa5
Merge: 96c1481 100b3efd
Author: Michele Ceriotti <michele.ceriotti@gmail.com>
Date:   Sat Feb 7 17:17:10 2015 +0100

    Merge branch 'master' into fccubic

    Conflicts:
    	src/crystallization/Fccubic.cpp

commit 96c1481f410516ca7c019033d3c880fc5a5dc9c3
Author: Michele Ceriotti <michele.ceriotti@gmail.com>
Date:   Sat Feb 7 16:44:15 2015 +0100

    Finished messing around with optimizations.

commit aa772a4dde348459a9b61d7d23fa22527541abf2
Merge: b371043 52ed4a59
Author: Michele Ceriotti <michele.ceriotti@gmail.com>
Date:   Sat Feb 7 15:02:30 2015 +0100

    Further speedups...

    Merge branch 'master' into fccubic

    Conflicts:
    	src/multicolvar/BridgedMultiColvarFunction.cpp
    	src/tools/SwitchingFunction.cpp

commit b37104386b57c4e9291c63ee21149352c18792f9
Author: Michele Ceriotti <michele.ceriotti@gmail.com>
Date:   Sat Feb 7 14:01:41 2015 +0100

    Tried to shave off some time from the PBC evaluation

commit cfc2f9491261154cddf7cc0fdde5807f7b01199d
Author: BingqingCheng <tonicbq@gmail.com>
Date:   Tue Jan 6 18:43:55 2015 +0100

    Ouch...

commit 43f7df5c9f5c237002c5a325765947753340a13b
Author: BingqingCheng <tonicbq@gmail.com>
Date:   Tue Jan 6 18:11:35 2015 +0100

    Another mistake

commit 4980c617a8bfd1cff0840d296517c6255d505d92
Author: BingqingCheng <tonicbq@gmail.com>
Date:   Tue Jan 6 17:54:44 2015 +0100

    Made a mistake in the derivative

commit 7eaa00302a4432c5a2ad5bc8bbde77495c48283b
Author: BingqingCheng <tonicbq@gmail.com>
Date:   Tue Jan 6 17:35:09 2015 +0100

    Add orientation specification in FCCUBIC

commit 441bc44a5d901f076170c53d69081ba072b6863a
Author: BingqingCheng <tonicbq@gmail.com>
Date:   Fri Dec 5 13:55:08 2014 +0100

    add alpha to modify the fcc harmonic function

commit 0de35e6edfa8e8306d602154eefb8c573a43c5b8
Author: BingqingCheng <tonicbq@gmail.com>
Date:   Tue Nov 25 16:59:26 2014 +0100

    Modified FCCubic