Hacking on the atom selection code
Simplify a little
Fix a bug
trailing whitespace
Merge remote-tracking branch 'origin/mpharrigan-selectionlang2' into selectionlang2

Conflicts:
	MDTraj/core/selection.py
	MDTraj/core/topology.py
	MDTraj/tests/test_selection.py