working in seperate branches for now
Merge branch 'master' of github.com:davidnuon/metermaids