Merge pull request #5 from stalderc/master

Lot's of fixes...
added display drop downs to all edit forms
Merge pull request #24 from josephbooth/master

lots of fixes