Added CTF_Timer_epochs whose use requires the latest CTF from the master branch
Merge branch 'master' of http://github.com/devinamatthews/aquarius