Merge pull request #271 from GabrielleV/7.x-1.x-alpha

Fix machine name of node type being displayed on node add page instead of human name.
Add None option for non-required select fields