Change to some function names.
Merge branch 'master' into kyle

Conflicts:
	sendwithus.php
Made the API key entry screen prettier.
Moved some stuff from sendwithus.php into helper_functions.php
Merge branch 'kyle'