Added place holders to forms, and Input old.
Merge master, fix conflicts.
Merge pull request #74 from jloehman/mallory

Added place holders to forms, and Input old.