format updates

Signed-off-by: Christopher Ross <cross@thisismyurl.com>
Merge branch 'master' of https://github.com/thisismyurl/wordpress-plugins-common

Signed-off-by: Christopher Ross <cross@thisismyurl.com>

Conflicts:
	thisismyurl-common-functions.php