add User and MeterReading models
Parse GreenButton data
syntax changes in parsers
in progress stuff in views
merged changes
fix timezone stuff
add history to views
parsers to merge
Merge branch 'master' of https://github.com/samongoose/watttime
actual utc timezone
Merge branch 'master' of https://github.com/samongoose/watttime
importing historical data, so stop offsetting date from gb
Merge branch 'master' of https://github.com/samongoose/watttime
add gitattributes to crlf stays intact
Merge branch 'master' of https://github.com/samongoose/watttime
maybe fix line endings
Merge branch 'master' of https://github.com/samongoose/watttime
update gitignore
changed v1
Merge branch 'master' of https://github.com/400yk/watttime