Fix (?) for resources.py and improvements for building on Mac OS X.
Merge branch 'master' of https://aston.googlecode.com/git