Updates for mountain lion
Merge pull request #1 from jstultz/master

Updates for mountain lion