need to mark files with correct coding type
due to author name..
misspelling
I think a point release is due..
Merge branch 'master-thomas'
This are the changes from coldfix/master
plus a few minor edits from me

The code is perhaps not complete yet, but doesn't break
anything as far as I can see
Add madx.evaluate routine to evaluate string expressions
Add unittest for madx.evaluate
Convert to lowercase in madx.evaluate
Merge pull request #22 from pymad/madx-evaluate

Madx evaluate numeric expression
moved test files to correct subfolder
added new tests
added unittest.main() when tests are ran
Merge pull request #23 from pymad/test_cpymad

Test cpymad
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cern/cpymad/model_locator.py
	src/cern/resource/base.py
	src/cern/resource/couch.py
	src/cern/resource/file.py
	src/cern/resource/package.py

conflicts were related to iso -> utf8 in header of some files