committing trivial changes before merge
fixed merge conflicts
adding stuff for gmaps4rails
fixing merge errors what else is new
working on gmaps stuff, it kind of works a little. its 4am, going to bed