Clean up whitespace
Use angular 1.2.0-rc.2 with better $q.when