set correct environments in .travis.yml
merged master back to pharogemstone
added watchingTimeline & fixed commit events