fix unicorn
Merge branch 'master' of https://github.com/jodyalbritton/whatsmyx
Merge branch 'master' of https://github.com/jodyalbritton/whatsmyx
Merge branch 'master' of https://github.com/jodyalbritton/whatsmyx
Merge branch 'master' of https://github.com/jodyalbritton/whatsmyx
Merge branch 'master' of https://github.com/jodyalbritton/whatsmyx
Merge branch 'master' of https://github.com/jodyalbritton/whatsmyx
Merge branch 'master' of https://github.com/jodyalbritton/whatsmyx
Merge branch 'master' of https://github.com/jodyalbritton/whatsmyx
Merge branch 'master' of https://github.com/jodyalbritton/whatsmyx
Merge branch 'master' of https://github.com/jodyalbritton/whatsmyx

Conflicts:
	db/schema.rb
Merge branch 'master' of https://github.com/jodyalbritton/whatsmyx
Merge branch 'master' of https://github.com/jodyalbritton/whatsmyx
Merge branch 'master' of https://github.com/jodyalbritton/whatsmyx
clean up