This closes #47 and aslo closes #51
Merge branch 'master' of https://github.com/wpninjas/ninja-forms