Remove << conflict lines
Changes to try to get LB3 running again
Reconcile and update paths to files
Remember issues with getting LB3 to work

the way in which options is handled has changed with backbone 1.1.  It needs to be attacheded deliberately and is not attached automatically.  This will be important if we need to get LB3 working again in the new framework.  This may never be necessary.
Merge pull request #258 from mgage/develop_tmp2

Develop tmp2 --minor fixes