random changes
merging with db_work
avi's changes
Merge branch 'db_work' into db_work_justin
committing misc disposable changes
merge conflict
eugene's help changes