Merging in dev changes for v1.3.1

Changes:
- Reformat plugin file for consistent whitespace, operator statements
- Replace deprecated WP function use
- Fix various PHP warnings