Add phone too
Update new.html

Add phone
Update users.coffee

Add phone
Let's have website on here too
Add website field
Merge branch 'master' of https://github.com/metoro/pos.bitcoincoop.org

* 'master' of https://github.com/metoro/pos.bitcoincoop.org:
  Update users.coffee
  Update new.html
Added website
Fix merge issue
Fix tabs issue with coffeescript... :-o
Fix more coffee strangeness
Draw merchant types from DB
Do some database init
Skip other
Treat blank as Other for merchant type
Fix db init
Fix db init
Merge pull request #5 from metoro/master

Add phone+website