[OSM-dev] api06 resync

[Shaun McDonald]

Hi OSM api devs,

Earlier this afternoon, I resynced the 0.6 api branch of the API with  
the changes made to head since the last resync. As there were some new  
migrations in head, I have had to move the migrations in the api06  
branch, to new numbers above those in head.

Also done a fix to one of the tests that was broken, due to a good  
code change. rake test works on that branch,  you will need to do a  
rake test:prepare before hand to setup the test database.

Shaun