Merge pull request #65 from mbw2001/master

Ignore Aptana settings