remove skeleton command's siteDir option (duplicating main option)
add honeypot
rename honeypot to antispam
rename ama to _warp_antispam
Merge pull request #33 from phunehehe/honeypot

Add JS-based spam protection for forms.
Merge remote-tracking branch 'refs/remotes/upstream/master' into refactor-subcommands
Merge branch 'refactor-subcommands' into schemup-integration

Conflicts:
	warp/command.py