Added XML parsing for pid parameters.
Changed the name of one of the tests in test_controller.py
Merge branch 'master' of https://github.com/whittenjaw85/pysimiam into test

Conflicts:
	scripts/simulator.py
Merge branch 'test' of github.com:whittenjaw85/pysimiam
Commented Simulator 'raise Exception' - readconfig