Forces the use of PyQt4 (avoid PySide)
Fixes warnings/imports/w-space in configuration.py
Fixes typo
Skips TestConfiguration#test_parser() on PY26
Merge branch 'fix-argparse-py26' into 'master'
Fixed "dictionary changed size during iteration" in gui/preferences.py

Ticket: 883
Hide end time in provenance view

Also shortens start time
The full times can still be seen in the details window

gui/collection/vis_log.py: QExecutionItem
Keep inputs/outputs/annotations from overflowing on Mac

gui/module_info.py:
  Use stylesheet with font size 12pt
  Need to check how this looks on other platforms
Fix issue with package reloading in Mac binary

The issue was the fact that all packages live inside of lib/python2.7
so all included vistrails packages were identified as system packages.
Now, we just exclude anything in lib/python2.7/vistrails.

vistrails/core/modules/package.py:
  - Package.import_override.is_sys_pkg: use modified regex and logic

Ticket: 762
Fixes David's regex with negative look-aheads
Merge branch 'v2.1' into 'master'

Conflicts:
	vistrails/core/modules/package.py