Preparing for OpenStack testing environment

Renamed logging.py to log.py. I was getting import errors because it conflicts
with logging in the stdlib.
Fixing ordereddict and format string for py26
Fixing merge conflicts, passing py26
Merge remote-tracking branch 'origin/master' into JoshNang/testr

Conflicts:
	teeth_agent/cmd/agent.py
	teeth_agent/hardware.py
	teeth_agent/log.py
	teeth_agent/tests/log.py
	tox.ini
Adding Apache header
Merge pull request #63 from rackerlabs/JoshNang/testr

Preparing for OpenStack testing environment
Merge branch 'master' into remove-werkzeug
fix tests on python 2.6