some changes
change deploy points, add more info to json
adding json callback
merging
adding twix
fixing
fixing
update
merging conflicts
freezing
updating gems
removing unneeded models
paring down gems
updating readme