Updated code to handle TickSkip
Took out eclipse stuff
Merged upstream
Remove stuff I'm not using from upstream