Removed the timestamp feeds.

Signed-off-by: Kevin Thomas <kevin.thomas@tigerspike.com>
Merge branch 'develop' into feature/kt/timestamps
Merge branch 'feature/kt/timestamps' into develop