rubbing my smell glands on yr project
rake db:migrate
Bump to Angular 1.2.
Remove view specs.
Bump gems.
Factories and geocoding addresses
Persona callback must use querystring json flag
Merge pull request #19 from jcummins/master

Fix persona login
rails-pry
Merge branch 'master' into penguin

Conflicts:
	Gemfile
	Gemfile.lock
Move config/database.yml to config.example.yml and gitignore.

'Twill keep everyone from clobbering each others' setups.
Add db config for Travis to ensure it will create and run.
Merge pull request #15 from unsay/penguin

Penguin
Merge branch 'master' into restangularUsers