initial meeting with Nancy
lot of changes
more work
add voting body, fix bugs
publishing
Merge branch 'jholland-12-27-2013'
Merging in all the changes since initial setup