add history to views
parsers to merge
Merge branch 'master' of https://github.com/samongoose/watttime
Merge branch 'master' of https://github.com/samongoose/watttime
Merge branch 'master' of https://github.com/samongoose/watttime
Merge branch 'master' of https://github.com/samongoose/watttime
Merge branch 'master' of https://github.com/samongoose/watttime
broken history
Merge branch 'master' of https://github.com/samongoose/watttime