some heroku updates, fixing grid question bug
merge
fixes for heroku grid question, etc