Added comment ordering and improved listing views
Merge branch 'master' of https://github.com/Narayanan170/diskoinfo into Narayanan170-master
merge conflict cleanup
Merge pull request #9 from droan/master

merge conflict cleanup