Merge pull request #468 from akash/master

reintroducing old json calls for backwards compatability
Merge pull request #470 from akash/master

Faris/Akash/Subhas - updated deploy.rb to clean up old versions
Faris/Akash/Subhas - updated deploy.rb to clean up old versions
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	config/deploy.rb