JDK6 Support

Eliminates use of Diamonds
Converts all Path usage to File
Fixes portability of ConcurrentDeque that never should have been removed