Merge branch 'master', remote branch 'origin'
Merge remote branch 'origin/master'
unfinished work on pyFAI
make pyFAI plugin work
mxsup717: Added boolean attribute labelitIndexing to XSDataResultIndexing
Azimuthal integrator for biosaxs using PyFAI
minor changes
Generalize "except Exception" to prevent keyboard interupts from being
caught
FFXAS: Shorter datamodel creation
basic fixes
basic changes
minor clean-up (from pylint)
Merge remote branch 'origin/master'
use the default system python (not pyton2.6 hard coded)
bug840: Removed import of the package "exceptions"
Merge branch 'master' into bug840
Merge branch 'master' into mxsup717
add gitignore file. it covers the downloaded files in libraries/
mxsup717: Added temporarily "MOSFLM indexing" or "Labelit indexing" to
the comment of Screening
Merge pull request #17 from tbn/gitignore_for_libs

add gitignore file. it covers the downloaded files in libraries/