Merge branch 'scaling-down-if-cpu-mem-maxed-out' of https://github.com/shatterednirvana/appscale into testing
Merge branch 'testing' of https://github.com/AppScale/appscale into testing
Merge branch 'testing' of git://github.com/AppScale/appscale into testing
Merge branch 'dont-interpret-zero-data-as-no-data' of https://github.com/shatterednirvana/appscale into testing
Merge branch 'testing' of https://github.com/AppScale/appscale into testing
Merge branch 'testing' of git://github.com/AppScale/appscale into testing
no longer skipping other apps' scaling if a single app wants to scale up across nodes
removed rotating buffer for request rate, since we weren't using it, and only scaling based on enqueued requests
no longer scaling to new VMs based on cpu/memory, but based on # of appservers, like we do for scaling down
printing Hashes with instance info better
cleaned up logging, removed time requirement on scaling within VMs, and scaling down across VMs only after a certain amount of time has passed (instead of before a certain amount of time has passed)
fixed incorrect indentation
scaling once we hit max appservers, not when we pass it
not crashing when the app console is viewed on a loading app
fixed misspelled template variable
fixed how we parse instance ids when we send data to other nodes or get it from ZK
Merge branch 'testing' of github.com:AppScale/appscale into testing
Merge pull request #633 from shatterednirvana/handle-admin-link-correctly-on-none

not crashing when the app console is viewed on a loading app
Merge pull request #632 from shatterednirvana/simpler-scaling-rules

Simpler scaling rules
only erasing cassandra and zookeeper data if the user asks for it