Removed deprecated __FILE__ calls
Merge pull request #113 from jwarwick/__file__

Removed deprecated __FILE__ calls