Pulled changes from master

Made a change to try and get the gitignore file working correctly, according to this thread on StackOverflow. http://stackoverflow.com/questions/1139762/ignore-files-that-have-already-been-committed-to-a-git-repository