Renamed some variables, added a delete statement, updated proj for OS X 10.10
Got rid of some necessary print statements and comments
Started work on making it compile to linux