form error fixes
AMI/EMI Addition, misc improvements
Merge branch 'rewrite' of github.com:AppScale/appscake into rewrite

Conflicts:
	README.md
	appscake/views.py