iwps2012 updates
cleanup and bugfixes
Merge branch 'master' of github.com:erikdaniel/iwps

Conflicts:
	iwps.module
	iwps.utils.inc