Completed TimePirate merge

This build completes the code merge from TimePirate, and cleans up some
unnecessary files.