From 043439abcfac4667b8c47ea2872e9c30a9ab5c18 Mon Sep 17 00:00:00 2001
From: metoro <mail@benp.net>
Date: Mon, 30 Sep 2013 00:14:47 -0700
Subject: Add phone too

---
 routes/users.coffee  | 1 +
 views/users/new.html | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/routes/users.coffee b/routes/users.coffee
index 631ea2be..21485f75 100644
--- a/routes/users.coffee
+++ b/routes/users.coffee
@@ -47,6 +47,7 @@ module.exports = (sessions) ->
                 lastname: req.body.lastname,
                 company: req.body.company,
                 email: req.body.email,
+                phone: req.body.phone,
                 companytype: req.body.companytype,
                 address1: req.body.address1,
                 address2: req.body.address2,
diff --git a/views/users/new.html b/views/users/new.html
index 04ebb9d0..29283514 100644
--- a/views/users/new.html
+++ b/views/users/new.html
@@ -21,6 +21,9 @@
 
         <label for="email">Email:</label>
         <input type="email" id="email" name="email" value="" />
+       
+        <label for="phone">Phone:</label>
+        <input type="text" id="phone" name="phone" value="" />
 
         <label for="firstname">First Name:</label>
         <input type="text" id="firstname" name="firstname" value="" />
-- 
cgit v1.2.3


From 055b82b9e58c2e2939c1185fef4863b57d54d6fc Mon Sep 17 00:00:00 2001
From: metoro <mail@benp.net>
Date: Mon, 30 Sep 2013 00:23:39 -0700
Subject: Update new.html

Add phone
---
 views/users/new.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/views/users/new.html b/views/users/new.html
index 04ebb9d0..e336af9e 100644
--- a/views/users/new.html
+++ b/views/users/new.html
@@ -22,6 +22,9 @@
         <label for="email">Email:</label>
         <input type="email" id="email" name="email" value="" />
 
+        <label for="phone">Phone:</label>
+        <input type="text" id="phone" name="phone" value="" />
+
         <label for="firstname">First Name:</label>
         <input type="text" id="firstname" name="firstname" value="" />
         
-- 
cgit v1.2.3


From 4194becf3412819eaa914bb1dc645f2208e523f9 Mon Sep 17 00:00:00 2001
From: metoro <mail@benp.net>
Date: Mon, 30 Sep 2013 00:24:34 -0700
Subject: Update users.coffee

Add phone
---
 routes/users.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routes/users.coffee b/routes/users.coffee
index 631ea2be..21485f75 100644
--- a/routes/users.coffee
+++ b/routes/users.coffee
@@ -47,6 +47,7 @@ module.exports = (sessions) ->
                 lastname: req.body.lastname,
                 company: req.body.company,
                 email: req.body.email,
+                phone: req.body.phone,
                 companytype: req.body.companytype,
                 address1: req.body.address1,
                 address2: req.body.address2,
-- 
cgit v1.2.3


From 9b3c0d1c05e2447e5dc09d480e26deba22d96766 Mon Sep 17 00:00:00 2001
From: metoro <mail@benp.net>
Date: Wed, 2 Oct 2013 16:26:58 -0700
Subject: Let's have website on here too

---
 views/users/new.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/views/users/new.html b/views/users/new.html
index 29283514..3adfe651 100644
--- a/views/users/new.html
+++ b/views/users/new.html
@@ -302,6 +302,9 @@
         <option value="Zimbabwe">Zimbabwe</option>
         </select>
 
+        <label for="web">Website:</label>
+        <input type="text" id="web" name="web" value="" />
+
 		<br />
         <input class="btn" type="submit" value="Go" />
       </form>
-- 
cgit v1.2.3


From 2cb11063b53431fd6a3669911380a534e724e4af Mon Sep 17 00:00:00 2001
From: metoro <mail@benp.net>
Date: Wed, 2 Oct 2013 16:27:34 -0700
Subject: Add website field

---
 routes/users.coffee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/routes/users.coffee b/routes/users.coffee
index 21485f75..e01ef414 100644
--- a/routes/users.coffee
+++ b/routes/users.coffee
@@ -54,7 +54,8 @@ module.exports = (sessions) ->
                 city: req.body.city,
                 postcode: req.body.postcode,
                 state: req.body.state,
-                country: req.body.country   
+                country: req.body.country,
+                web: req.body.web
             }
             ,
             ->
-- 
cgit v1.2.3


From cc5da1593b2d5b50175ed1fa049c4afa1b0429ed Mon Sep 17 00:00:00 2001
From: metoro <mail@benp.net>
Date: Wed, 2 Oct 2013 16:37:49 -0700
Subject: Added website

---
 routes/users.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routes/users.coffee b/routes/users.coffee
index e01ef414..5b08778a 100644
--- a/routes/users.coffee
+++ b/routes/users.coffee
@@ -59,8 +59,8 @@ module.exports = (sessions) ->
             }
             ,
             ->
-              req.headers['referer'] = "/#{req.body.username}/edit"
-              sessions.create(req, res)
+			req.headers['referer'] = "/#{req.body.username}/edit"
+			sessions.create(req, res)
           )
         )
     )
-- 
cgit v1.2.3


From f0a8f70a8d4d2e529f3137e125711c86d1da2e6f Mon Sep 17 00:00:00 2001
From: metoro <mail@benp.net>
Date: Wed, 2 Oct 2013 16:39:32 -0700
Subject: Fix merge issue

---
 views/users/new.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/views/users/new.html b/views/users/new.html
index 47ad247b..3adfe651 100644
--- a/views/users/new.html
+++ b/views/users/new.html
@@ -25,9 +25,6 @@
         <label for="phone">Phone:</label>
         <input type="text" id="phone" name="phone" value="" />
 
-        <label for="phone">Phone:</label>
-        <input type="text" id="phone" name="phone" value="" />
-
         <label for="firstname">First Name:</label>
         <input type="text" id="firstname" name="firstname" value="" />
         
-- 
cgit v1.2.3


From 72c30a6d61d129434c83a517e9129bd25029aa3e Mon Sep 17 00:00:00 2001
From: metoro <mail@benp.net>
Date: Wed, 2 Oct 2013 16:52:55 -0700
Subject: Fix tabs issue with coffeescript... :-o

---
 routes/users.coffee | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/routes/users.coffee b/routes/users.coffee
index 5b08778a..4f54a946 100644
--- a/routes/users.coffee
+++ b/routes/users.coffee
@@ -3,7 +3,7 @@ bcrypt = require('bcrypt')
 
 module.exports = (sessions) ->
   exists: (req, res) ->
-  	
+      
     db.hgetall("user:"+req.params.user, (err, obj) ->
       if obj? then res.write('true') else res.write('false')
       res.end()
@@ -39,7 +39,7 @@ module.exports = (sessions) ->
           db.sadd("users",userkey)
           db.hmset(
             userkey, 
-            {   
+            {
                 username: req.body.username, 
                 password: hash, 
                 email: req.body.email,
@@ -56,11 +56,10 @@ module.exports = (sessions) ->
                 state: req.body.state,
                 country: req.body.country,
                 web: req.body.web
-            }
-            ,
+            },
             ->
-			req.headers['referer'] = "/#{req.body.username}/edit"
-			sessions.create(req, res)
+            req.headers['referer'] = "/#{req.body.username}/edit"
+            sessions.create(req, res)
           )
         )
     )
@@ -74,7 +73,7 @@ module.exports = (sessions) ->
 
   update: (req, res) ->
     return unless req.params.user is req.user.username or 
-      req.user.username is 'admin'
+    req.user.username is 'admin'
     db.hmset("user:"+req.params.user, req.body, ->
-     res.redirect("/#{req.params.user}")
+    res.redirect("/#{req.params.user}")
     )
-- 
cgit v1.2.3


From 9ce3e483151f4a4856ee17286bfd6729a4399577 Mon Sep 17 00:00:00 2001
From: metoro <mail@benp.net>
Date: Wed, 2 Oct 2013 17:17:18 -0700
Subject: Fix more coffee strangeness

---
 routes/users.coffee | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/routes/users.coffee b/routes/users.coffee
index 4f54a946..2397c4a8 100644
--- a/routes/users.coffee
+++ b/routes/users.coffee
@@ -36,31 +36,12 @@ module.exports = (sessions) ->
         res.redirect(req.body.username)
       else
         bcrypt.hash(req.body.password, 12, (err, hash) ->
-          db.sadd("users",userkey)
-          db.hmset(
-            userkey, 
-            {
-                username: req.body.username, 
-                password: hash, 
-                email: req.body.email,
-                firstname: req.body.firstname,
-                lastname: req.body.lastname,
-                company: req.body.company,
-                email: req.body.email,
-                phone: req.body.phone,
-                companytype: req.body.companytype,
-                address1: req.body.address1,
-                address2: req.body.address2,
-                city: req.body.city,
-                postcode: req.body.postcode,
-                state: req.body.state,
-                country: req.body.country,
-                web: req.body.web
-            },
-            ->
-            req.headers['referer'] = "/#{req.body.username}/edit"
-            sessions.create(req, res)
-          )
+           db.sadd("users",userkey)
+           formfields = {username: req.body.username,password: hash,email: req.body.email,firstname: req.body.firstname,lastname: req.body.lastname,company: req.body.company,email: req.body.email,phone: req.body.phone,companytype: req.body.companytype,address1: req.body.address1,address2: req.body.address2,city: req.body.city,postcode: req.body.postcode,state: req.body.state,country: req.body.country,web: req.body.web}
+           db.hmset(userkey,formfields, ->
+              req.headers['referer'] = "/#{req.body.username}/edit"
+              sessions.create(req, res)
+           )
         )
     )
 
-- 
cgit v1.2.3


From 676a9c336a8cda838d7350134d2781c176731e6a Mon Sep 17 00:00:00 2001
From: metoro <mail@benp.net>
Date: Thu, 3 Oct 2013 13:55:52 -0700
Subject: Draw merchant types from DB

---
 routes/users.coffee  |  16 +-
 views/users/new.html | 600 ++++++++++++++++++++++++++-------------------------
 2 files changed, 317 insertions(+), 299 deletions(-)

diff --git a/routes/users.coffee b/routes/users.coffee
index 2397c4a8..380379e3 100644
--- a/routes/users.coffee
+++ b/routes/users.coffee
@@ -24,11 +24,19 @@ module.exports = (sessions) ->
     )
 
   new: (req, res) ->
-    res.render('users/new', 
-      js: (-> global.js), 
-      css: (-> global.css),
+    db.smembers('mts', (err, keys) ->
+       mts = []
+       for mt in keys
+          db.hgetall(mt, (err, it) ->
+            mts.push(it)
+            if keys.length==mts.length
+               res.render('users/new', 
+                  js: (-> global.js), 
+                  css: (-> global.css),
+                  mtypes: mts
+               )     
+          )
     )
-
   create: (req, res) ->
     userkey = "user:"+req.body.username
     db.hgetall(userkey, (err, obj) ->
diff --git a/views/users/new.html b/views/users/new.html
index 3adfe651..f0d87f67 100644
--- a/views/users/new.html
+++ b/views/users/new.html
@@ -11,303 +11,313 @@
   <body>
     <div class="container-fluid">
       <form action="/users" method="post">
-        <h1>Register</h1>
+      		<br/>
+      		<h1>Register</h1>
+      		<div class="row-fluid">
+  
+		  		<div class="span6">
+			        <label for="username">Username:</label>
+			        <input type="text" id="username" name="username" />
+			
+			        <label for="password">Password:</label>
+			        <input type="password" id="password" name="password" value="" />
+			
+			        <label for="firstname">Contact First Name:</label>
+			        <input type="text" id="firstname" name="firstname" value="" />
+			        
+			        <label for="lastname">Contact Last Name:</label>
+			        <input type="text" id="lastname" name="lastname" value="" />
+			
+			        <label for="email">Email:</label>
+			        <input type="email" id="email" name="email" value="" />
+			       
+			        <label for="phone">Phone:</label>
+			        <input type="text" id="phone" name="phone" value="" />
+			        	        
+			    </div>
+				<div class="span6">
+			        <label for="company">Company Name:</label>
+			        <input type="text" id="company" name="company" value="" />
+			    
+			        <label for="companytype">Company Type:</label>
+			        <select id="companytype" name="companytype">
+			        	{{#mtypes}}
+			        	<option value="{{code}}">{{label}}</option>
+			        	{{/mtypes}}
+			        </select>
+			        		
+			
+			        
+		
+			        <label for="web">Website:</label>
+			        <input type="text" id="web" name="web" value="" />	        	
 
-        <label for="username">Username:</label>
-        <input type="text" id="username" name="username" />
 
-        <label for="password">Password:</label>
-        <input type="password" id="password" name="password" value="" />
-
-        <label for="email">Email:</label>
-        <input type="email" id="email" name="email" value="" />
-       
-        <label for="phone">Phone:</label>
-        <input type="text" id="phone" name="phone" value="" />
-
-        <label for="firstname">First Name:</label>
-        <input type="text" id="firstname" name="firstname" value="" />
-        
-        <label for="lastname">Last Name:</label>
-        <input type="text" id="lastname" name="lastname" value="" />
-        
-        <label for="company">Company Name:</label>
-        <input type="text" id="company" name="company" value="" />
-    
-        <label for="companytype">Company Type:</label>
-        <select id="companytype" name="companytype">
-        	<option value="rest">Restaurant/Bar</option>
-        	<option value="coff">Coffee Shop</option>
-        	<option value="othr">Other</option>
-        </select>
-        
-        <label for="address1">Address Line 1:</label>
-        <input type="text" id="address1" name="address1" value="" />
-        
-        <label for="address2">Address Line 2:</label>
-        <input type="text" id="address2" name="address2" value="" />
-        
-        <label for="city">City:</label>
-        <input type="text" id="city" name="city" value="" />
-                
-        <label for="postcode">Post Code:</label>
-        <input type="text" id="postcode" name="postcode" value="" />
-        
-        <label for="state">State/Province:</label>
-        <input type="text" id="state" name="state" value="" />
-        
-        <label for="country">Country:</label>
-    	<select id="country" name="country">
-        <option value="" selected="selected">Select Country</option>
-        <option value="United States">United States</option>
-        <option value="United Kingdom">United Kingdom</option>
-        <option value="Afghanistan">Afghanistan</option>
-        <option value="Albania">Albania</option>
-        <option value="Algeria">Algeria</option>
-        <option value="American Samoa">American Samoa</option>
-        <option value="Andorra">Andorra</option>
-        <option value="Angola">Angola</option>
-        <option value="Anguilla">Anguilla</option>
-        <option value="Antarctica">Antarctica</option>
-        <option value="Antigua and Barbuda">Antigua and Barbuda</option>
-        <option value="Argentina">Argentina</option>
-        <option value="Armenia">Armenia</option>
-        <option value="Aruba">Aruba</option>
-        <option value="Australia">Australia</option>
-        <option value="Austria">Austria</option>
-        <option value="Azerbaijan">Azerbaijan</option>
-        <option value="Bahamas">Bahamas</option>
-        <option value="Bahrain">Bahrain</option>
-        <option value="Bangladesh">Bangladesh</option>
-        <option value="Barbados">Barbados</option>
-        <option value="Belarus">Belarus</option>
-        <option value="Belgium">Belgium</option>
-        <option value="Belize">Belize</option>
-        <option value="Benin">Benin</option>
-        <option value="Bermuda">Bermuda</option>
-        <option value="Bhutan">Bhutan</option>
-        <option value="Bolivia">Bolivia</option>
-        <option value="Bosnia and Herzegovina">Bosnia and Herzegovina</option>
-        <option value="Botswana">Botswana</option>
-        <option value="Bouvet Island">Bouvet Island</option>
-        <option value="Brazil">Brazil</option>
-        <option value="British Indian Ocean Territory">British Indian Ocean Territory</option>
-        <option value="Brunei Darussalam">Brunei Darussalam</option>
-        <option value="Bulgaria">Bulgaria</option>
-        <option value="Burkina Faso">Burkina Faso</option>
-        <option value="Burundi">Burundi</option>
-        <option value="Cambodia">Cambodia</option>
-        <option value="Cameroon">Cameroon</option>
-        <option value="Canada" selected>Canada</option>
-        <option value="Cape Verde">Cape Verde</option>
-        <option value="Cayman Islands">Cayman Islands</option>
-        <option value="Central African Republic">Central African Republic</option>
-        <option value="Chad">Chad</option>
-        <option value="Chile">Chile</option>
-        <option value="China">China</option>
-        <option value="Christmas Island">Christmas Island</option>
-        <option value="Cocos (Keeling) Islands">Cocos (Keeling) Islands</option>
-        <option value="Colombia">Colombia</option>
-        <option value="Comoros">Comoros</option>
-        <option value="Congo">Congo</option>
-        <option value="Congo, The Democratic Republic of The">Congo, The Democratic Republic of The</option>
-        <option value="Cook Islands">Cook Islands</option>
-        <option value="Costa Rica">Costa Rica</option>
-        <option value="Cote D'ivoire">Cote D'ivoire</option>
-        <option value="Croatia">Croatia</option>
-        <option value="Cuba">Cuba</option>
-        <option value="Cyprus">Cyprus</option>
-        <option value="Czech Republic">Czech Republic</option>
-        <option value="Denmark">Denmark</option>
-        <option value="Djibouti">Djibouti</option>
-        <option value="Dominica">Dominica</option>
-        <option value="Dominican Republic">Dominican Republic</option>
-        <option value="Ecuador">Ecuador</option>
-        <option value="Egypt">Egypt</option>
-        <option value="El Salvador">El Salvador</option>
-        <option value="Equatorial Guinea">Equatorial Guinea</option>
-        <option value="Eritrea">Eritrea</option>
-        <option value="Estonia">Estonia</option>
-        <option value="Ethiopia">Ethiopia</option>
-        <option value="Falkland Islands (Malvinas)">Falkland Islands (Malvinas)</option>
-        <option value="Faroe Islands">Faroe Islands</option>
-        <option value="Fiji">Fiji</option>
-        <option value="Finland">Finland</option>
-        <option value="France">France</option>
-        <option value="French Guiana">French Guiana</option>
-        <option value="French Polynesia">French Polynesia</option>
-        <option value="French Southern Territories">French Southern Territories</option>
-        <option value="Gabon">Gabon</option>
-        <option value="Gambia">Gambia</option>
-        <option value="Georgia">Georgia</option>
-        <option value="Germany">Germany</option>
-        <option value="Ghana">Ghana</option>
-        <option value="Gibraltar">Gibraltar</option>
-        <option value="Greece">Greece</option>
-        <option value="Greenland">Greenland</option>
-        <option value="Grenada">Grenada</option>
-        <option value="Guadeloupe">Guadeloupe</option>
-        <option value="Guam">Guam</option>
-        <option value="Guatemala">Guatemala</option>
-        <option value="Guinea">Guinea</option>
-        <option value="Guinea-bissau">Guinea-bissau</option>
-        <option value="Guyana">Guyana</option>
-        <option value="Haiti">Haiti</option>
-        <option value="Heard Island and Mcdonald Islands">Heard Island and Mcdonald Islands</option>
-        <option value="Holy See (Vatican City State)">Holy See (Vatican City State)</option>
-        <option value="Honduras">Honduras</option>
-        <option value="Hong Kong">Hong Kong</option>
-        <option value="Hungary">Hungary</option>
-        <option value="Iceland">Iceland</option>
-        <option value="India">India</option>
-        <option value="Indonesia">Indonesia</option>
-        <option value="Iran, Islamic Republic of">Iran, Islamic Republic of</option>
-        <option value="Iraq">Iraq</option>
-        <option value="Ireland">Ireland</option>
-        <option value="Israel">Israel</option>
-        <option value="Italy">Italy</option>
-        <option value="Jamaica">Jamaica</option>
-        <option value="Japan">Japan</option>
-        <option value="Jordan">Jordan</option>
-        <option value="Kazakhstan">Kazakhstan</option>
-        <option value="Kenya">Kenya</option>
-        <option value="Kiribati">Kiribati</option>
-        <option value="Korea, Democratic People's Republic of">Korea, Democratic People's Republic of</option>
-        <option value="Korea, Republic of">Korea, Republic of</option>
-        <option value="Kuwait">Kuwait</option>
-        <option value="Kyrgyzstan">Kyrgyzstan</option>
-        <option value="Lao People's Democratic Republic">Lao People's Democratic Republic</option>
-        <option value="Latvia">Latvia</option>
-        <option value="Lebanon">Lebanon</option>
-        <option value="Lesotho">Lesotho</option>
-        <option value="Liberia">Liberia</option>
-        <option value="Libyan Arab Jamahiriya">Libyan Arab Jamahiriya</option>
-        <option value="Liechtenstein">Liechtenstein</option>
-        <option value="Lithuania">Lithuania</option>
-        <option value="Luxembourg">Luxembourg</option>
-        <option value="Macao">Macao</option>
-        <option value="Macedonia, The Former Yugoslav Republic of">Macedonia, The Former Yugoslav Republic of</option>
-        <option value="Madagascar">Madagascar</option>
-        <option value="Malawi">Malawi</option>
-        <option value="Malaysia">Malaysia</option>
-        <option value="Maldives">Maldives</option>
-        <option value="Mali">Mali</option>
-        <option value="Malta">Malta</option>
-        <option value="Marshall Islands">Marshall Islands</option>
-        <option value="Martinique">Martinique</option>
-        <option value="Mauritania">Mauritania</option>
-        <option value="Mauritius">Mauritius</option>
-        <option value="Mayotte">Mayotte</option>
-        <option value="Mexico">Mexico</option>
-        <option value="Micronesia, Federated States of">Micronesia, Federated States of</option>
-        <option value="Moldova, Republic of">Moldova, Republic of</option>
-        <option value="Monaco">Monaco</option>
-        <option value="Mongolia">Mongolia</option>
-        <option value="Montserrat">Montserrat</option>
-        <option value="Morocco">Morocco</option>
-        <option value="Mozambique">Mozambique</option>
-        <option value="Myanmar">Myanmar</option>
-        <option value="Namibia">Namibia</option>
-        <option value="Nauru">Nauru</option>
-        <option value="Nepal">Nepal</option>
-        <option value="Netherlands">Netherlands</option>
-        <option value="Netherlands Antilles">Netherlands Antilles</option>
-        <option value="New Caledonia">New Caledonia</option>
-        <option value="New Zealand">New Zealand</option>
-        <option value="Nicaragua">Nicaragua</option>
-        <option value="Niger">Niger</option>
-        <option value="Nigeria">Nigeria</option>
-        <option value="Niue">Niue</option>
-        <option value="Norfolk Island">Norfolk Island</option>
-        <option value="Northern Mariana Islands">Northern Mariana Islands</option>
-        <option value="Norway">Norway</option>
-        <option value="Oman">Oman</option>
-        <option value="Pakistan">Pakistan</option>
-        <option value="Palau">Palau</option>
-        <option value="Palestinian Territory, Occupied">Palestinian Territory, Occupied</option>
-        <option value="Panama">Panama</option>
-        <option value="Papua New Guinea">Papua New Guinea</option>
-        <option value="Paraguay">Paraguay</option>
-        <option value="Peru">Peru</option>
-        <option value="Philippines">Philippines</option>
-        <option value="Pitcairn">Pitcairn</option>
-        <option value="Poland">Poland</option>
-        <option value="Portugal">Portugal</option>
-        <option value="Puerto Rico">Puerto Rico</option>
-        <option value="Qatar">Qatar</option>
-        <option value="Reunion">Reunion</option>
-        <option value="Romania">Romania</option>
-        <option value="Russian Federation">Russian Federation</option>
-        <option value="Rwanda">Rwanda</option>
-        <option value="Saint Helena">Saint Helena</option>
-        <option value="Saint Kitts and Nevis">Saint Kitts and Nevis</option>
-        <option value="Saint Lucia">Saint Lucia</option>
-        <option value="Saint Pierre and Miquelon">Saint Pierre and Miquelon</option>
-        <option value="Saint Vincent and The Grenadines">Saint Vincent and The Grenadines</option>
-        <option value="Samoa">Samoa</option>
-        <option value="San Marino">San Marino</option>
-        <option value="Sao Tome and Principe">Sao Tome and Principe</option>
-        <option value="Saudi Arabia">Saudi Arabia</option>
-        <option value="Senegal">Senegal</option>
-        <option value="Serbia and Montenegro">Serbia and Montenegro</option>
-        <option value="Seychelles">Seychelles</option>
-        <option value="Sierra Leone">Sierra Leone</option>
-        <option value="Singapore">Singapore</option>
-        <option value="Slovakia">Slovakia</option>
-        <option value="Slovenia">Slovenia</option>
-        <option value="Solomon Islands">Solomon Islands</option>
-        <option value="Somalia">Somalia</option>
-        <option value="South Africa">South Africa</option>
-        <option value="South Georgia and The South Sandwich Islands">South Georgia and The South Sandwich Islands</option>
-        <option value="Spain">Spain</option>
-        <option value="Sri Lanka">Sri Lanka</option>
-        <option value="Sudan">Sudan</option>
-        <option value="Suriname">Suriname</option>
-        <option value="Svalbard and Jan Mayen">Svalbard and Jan Mayen</option>
-        <option value="Swaziland">Swaziland</option>
-        <option value="Sweden">Sweden</option>
-        <option value="Switzerland">Switzerland</option>
-        <option value="Syrian Arab Republic">Syrian Arab Republic</option>
-        <option value="Taiwan, Province of China">Taiwan, Province of China</option>
-        <option value="Tajikistan">Tajikistan</option>
-        <option value="Tanzania, United Republic of">Tanzania, United Republic of</option>
-        <option value="Thailand">Thailand</option>
-        <option value="Timor-leste">Timor-leste</option>
-        <option value="Togo">Togo</option>
-        <option value="Tokelau">Tokelau</option>
-        <option value="Tonga">Tonga</option>
-        <option value="Trinidad and Tobago">Trinidad and Tobago</option>
-        <option value="Tunisia">Tunisia</option>
-        <option value="Turkey">Turkey</option>
-        <option value="Turkmenistan">Turkmenistan</option>
-        <option value="Turks and Caicos Islands">Turks and Caicos Islands</option>
-        <option value="Tuvalu">Tuvalu</option>
-        <option value="Uganda">Uganda</option>
-        <option value="Ukraine">Ukraine</option>
-        <option value="United Arab Emirates">United Arab Emirates</option>
-        <option value="United Kingdom">United Kingdom</option>
-        <option value="United States">United States</option>
-        <option value="United States Minor Outlying Islands">United States Minor Outlying Islands</option>
-        <option value="Uruguay">Uruguay</option>
-        <option value="Uzbekistan">Uzbekistan</option>
-        <option value="Vanuatu">Vanuatu</option>
-        <option value="Venezuela">Venezuela</option>
-        <option value="Viet Nam">Viet Nam</option>
-        <option value="Virgin Islands, British">Virgin Islands, British</option>
-        <option value="Virgin Islands, U.S.">Virgin Islands, U.S.</option>
-        <option value="Wallis and Futuna">Wallis and Futuna</option>
-        <option value="Western Sahara">Western Sahara</option>
-        <option value="Yemen">Yemen</option>
-        <option value="Zambia">Zambia</option>
-        <option value="Zimbabwe">Zimbabwe</option>
-        </select>
-
-        <label for="web">Website:</label>
-        <input type="text" id="web" name="web" value="" />
-
-		<br />
-        <input class="btn" type="submit" value="Go" />
+			        <label for="address1">Address Line 1:</label>
+			        <input type="text" id="address1" name="address1" value="" />
+			        
+			        <label for="address2">Address Line 2:</label>
+			        <input type="text" id="address2" name="address2" value="" />
+			        
+			        <label for="city">City:</label>
+			        <input type="text" id="city" name="city" value="" />
+			                
+			        <label for="postcode">Post Code:</label>
+			        <input type="text" id="postcode" name="postcode" value="" />
+			        
+			        <label for="state">State/Province:</label>
+			        <input type="text" id="state" name="state" value="" />
+			        
+			        <label for="country">Country:</label>
+			    	<select id="country" name="country">
+			        <option value="" selected="selected">Select Country</option>
+			        <option value="United States">United States</option>
+			        <option value="United Kingdom">United Kingdom</option>
+			        <option value="Afghanistan">Afghanistan</option>
+			        <option value="Albania">Albania</option>
+			        <option value="Algeria">Algeria</option>
+			        <option value="American Samoa">American Samoa</option>
+			        <option value="Andorra">Andorra</option>
+			        <option value="Angola">Angola</option>
+			        <option value="Anguilla">Anguilla</option>
+			        <option value="Antarctica">Antarctica</option>
+			        <option value="Antigua and Barbuda">Antigua and Barbuda</option>
+			        <option value="Argentina">Argentina</option>
+			        <option value="Armenia">Armenia</option>
+			        <option value="Aruba">Aruba</option>
+			        <option value="Australia">Australia</option>
+			        <option value="Austria">Austria</option>
+			        <option value="Azerbaijan">Azerbaijan</option>
+			        <option value="Bahamas">Bahamas</option>
+			        <option value="Bahrain">Bahrain</option>
+			        <option value="Bangladesh">Bangladesh</option>
+			        <option value="Barbados">Barbados</option>
+			        <option value="Belarus">Belarus</option>
+			        <option value="Belgium">Belgium</option>
+			        <option value="Belize">Belize</option>
+			        <option value="Benin">Benin</option>
+			        <option value="Bermuda">Bermuda</option>
+			        <option value="Bhutan">Bhutan</option>
+			        <option value="Bolivia">Bolivia</option>
+			        <option value="Bosnia and Herzegovina">Bosnia and Herzegovina</option>
+			        <option value="Botswana">Botswana</option>
+			        <option value="Bouvet Island">Bouvet Island</option>
+			        <option value="Brazil">Brazil</option>
+			        <option value="British Indian Ocean Territory">British Indian Ocean Territory</option>
+			        <option value="Brunei Darussalam">Brunei Darussalam</option>
+			        <option value="Bulgaria">Bulgaria</option>
+			        <option value="Burkina Faso">Burkina Faso</option>
+			        <option value="Burundi">Burundi</option>
+			        <option value="Cambodia">Cambodia</option>
+			        <option value="Cameroon">Cameroon</option>
+			        <option value="Canada" selected>Canada</option>
+			        <option value="Cape Verde">Cape Verde</option>
+			        <option value="Cayman Islands">Cayman Islands</option>
+			        <option value="Central African Republic">Central African Republic</option>
+			        <option value="Chad">Chad</option>
+			        <option value="Chile">Chile</option>
+			        <option value="China">China</option>
+			        <option value="Christmas Island">Christmas Island</option>
+			        <option value="Cocos (Keeling) Islands">Cocos (Keeling) Islands</option>
+			        <option value="Colombia">Colombia</option>
+			        <option value="Comoros">Comoros</option>
+			        <option value="Congo">Congo</option>
+			        <option value="Congo, The Democratic Republic of The">Congo, The Democratic Republic of The</option>
+			        <option value="Cook Islands">Cook Islands</option>
+			        <option value="Costa Rica">Costa Rica</option>
+			        <option value="Cote D'ivoire">Cote D'ivoire</option>
+			        <option value="Croatia">Croatia</option>
+			        <option value="Cuba">Cuba</option>
+			        <option value="Cyprus">Cyprus</option>
+			        <option value="Czech Republic">Czech Republic</option>
+			        <option value="Denmark">Denmark</option>
+			        <option value="Djibouti">Djibouti</option>
+			        <option value="Dominica">Dominica</option>
+			        <option value="Dominican Republic">Dominican Republic</option>
+			        <option value="Ecuador">Ecuador</option>
+			        <option value="Egypt">Egypt</option>
+			        <option value="El Salvador">El Salvador</option>
+			        <option value="Equatorial Guinea">Equatorial Guinea</option>
+			        <option value="Eritrea">Eritrea</option>
+			        <option value="Estonia">Estonia</option>
+			        <option value="Ethiopia">Ethiopia</option>
+			        <option value="Falkland Islands (Malvinas)">Falkland Islands (Malvinas)</option>
+			        <option value="Faroe Islands">Faroe Islands</option>
+			        <option value="Fiji">Fiji</option>
+			        <option value="Finland">Finland</option>
+			        <option value="France">France</option>
+			        <option value="French Guiana">French Guiana</option>
+			        <option value="French Polynesia">French Polynesia</option>
+			        <option value="French Southern Territories">French Southern Territories</option>
+			        <option value="Gabon">Gabon</option>
+			        <option value="Gambia">Gambia</option>
+			        <option value="Georgia">Georgia</option>
+			        <option value="Germany">Germany</option>
+			        <option value="Ghana">Ghana</option>
+			        <option value="Gibraltar">Gibraltar</option>
+			        <option value="Greece">Greece</option>
+			        <option value="Greenland">Greenland</option>
+			        <option value="Grenada">Grenada</option>
+			        <option value="Guadeloupe">Guadeloupe</option>
+			        <option value="Guam">Guam</option>
+			        <option value="Guatemala">Guatemala</option>
+			        <option value="Guinea">Guinea</option>
+			        <option value="Guinea-bissau">Guinea-bissau</option>
+			        <option value="Guyana">Guyana</option>
+			        <option value="Haiti">Haiti</option>
+			        <option value="Heard Island and Mcdonald Islands">Heard Island and Mcdonald Islands</option>
+			        <option value="Holy See (Vatican City State)">Holy See (Vatican City State)</option>
+			        <option value="Honduras">Honduras</option>
+			        <option value="Hong Kong">Hong Kong</option>
+			        <option value="Hungary">Hungary</option>
+			        <option value="Iceland">Iceland</option>
+			        <option value="India">India</option>
+			        <option value="Indonesia">Indonesia</option>
+			        <option value="Iran, Islamic Republic of">Iran, Islamic Republic of</option>
+			        <option value="Iraq">Iraq</option>
+			        <option value="Ireland">Ireland</option>
+			        <option value="Israel">Israel</option>
+			        <option value="Italy">Italy</option>
+			        <option value="Jamaica">Jamaica</option>
+			        <option value="Japan">Japan</option>
+			        <option value="Jordan">Jordan</option>
+			        <option value="Kazakhstan">Kazakhstan</option>
+			        <option value="Kenya">Kenya</option>
+			        <option value="Kiribati">Kiribati</option>
+			        <option value="Korea, Democratic People's Republic of">Korea, Democratic People's Republic of</option>
+			        <option value="Korea, Republic of">Korea, Republic of</option>
+			        <option value="Kuwait">Kuwait</option>
+			        <option value="Kyrgyzstan">Kyrgyzstan</option>
+			        <option value="Lao People's Democratic Republic">Lao People's Democratic Republic</option>
+			        <option value="Latvia">Latvia</option>
+			        <option value="Lebanon">Lebanon</option>
+			        <option value="Lesotho">Lesotho</option>
+			        <option value="Liberia">Liberia</option>
+			        <option value="Libyan Arab Jamahiriya">Libyan Arab Jamahiriya</option>
+			        <option value="Liechtenstein">Liechtenstein</option>
+			        <option value="Lithuania">Lithuania</option>
+			        <option value="Luxembourg">Luxembourg</option>
+			        <option value="Macao">Macao</option>
+			        <option value="Macedonia, The Former Yugoslav Republic of">Macedonia, The Former Yugoslav Republic of</option>
+			        <option value="Madagascar">Madagascar</option>
+			        <option value="Malawi">Malawi</option>
+			        <option value="Malaysia">Malaysia</option>
+			        <option value="Maldives">Maldives</option>
+			        <option value="Mali">Mali</option>
+			        <option value="Malta">Malta</option>
+			        <option value="Marshall Islands">Marshall Islands</option>
+			        <option value="Martinique">Martinique</option>
+			        <option value="Mauritania">Mauritania</option>
+			        <option value="Mauritius">Mauritius</option>
+			        <option value="Mayotte">Mayotte</option>
+			        <option value="Mexico">Mexico</option>
+			        <option value="Micronesia, Federated States of">Micronesia, Federated States of</option>
+			        <option value="Moldova, Republic of">Moldova, Republic of</option>
+			        <option value="Monaco">Monaco</option>
+			        <option value="Mongolia">Mongolia</option>
+			        <option value="Montserrat">Montserrat</option>
+			        <option value="Morocco">Morocco</option>
+			        <option value="Mozambique">Mozambique</option>
+			        <option value="Myanmar">Myanmar</option>
+			        <option value="Namibia">Namibia</option>
+			        <option value="Nauru">Nauru</option>
+			        <option value="Nepal">Nepal</option>
+			        <option value="Netherlands">Netherlands</option>
+			        <option value="Netherlands Antilles">Netherlands Antilles</option>
+			        <option value="New Caledonia">New Caledonia</option>
+			        <option value="New Zealand">New Zealand</option>
+			        <option value="Nicaragua">Nicaragua</option>
+			        <option value="Niger">Niger</option>
+			        <option value="Nigeria">Nigeria</option>
+			        <option value="Niue">Niue</option>
+			        <option value="Norfolk Island">Norfolk Island</option>
+			        <option value="Northern Mariana Islands">Northern Mariana Islands</option>
+			        <option value="Norway">Norway</option>
+			        <option value="Oman">Oman</option>
+			        <option value="Pakistan">Pakistan</option>
+			        <option value="Palau">Palau</option>
+			        <option value="Palestinian Territory, Occupied">Palestinian Territory, Occupied</option>
+			        <option value="Panama">Panama</option>
+			        <option value="Papua New Guinea">Papua New Guinea</option>
+			        <option value="Paraguay">Paraguay</option>
+			        <option value="Peru">Peru</option>
+			        <option value="Philippines">Philippines</option>
+			        <option value="Pitcairn">Pitcairn</option>
+			        <option value="Poland">Poland</option>
+			        <option value="Portugal">Portugal</option>
+			        <option value="Puerto Rico">Puerto Rico</option>
+			        <option value="Qatar">Qatar</option>
+			        <option value="Reunion">Reunion</option>
+			        <option value="Romania">Romania</option>
+			        <option value="Russian Federation">Russian Federation</option>
+			        <option value="Rwanda">Rwanda</option>
+			        <option value="Saint Helena">Saint Helena</option>
+			        <option value="Saint Kitts and Nevis">Saint Kitts and Nevis</option>
+			        <option value="Saint Lucia">Saint Lucia</option>
+			        <option value="Saint Pierre and Miquelon">Saint Pierre and Miquelon</option>
+			        <option value="Saint Vincent and The Grenadines">Saint Vincent and The Grenadines</option>
+			        <option value="Samoa">Samoa</option>
+			        <option value="San Marino">San Marino</option>
+			        <option value="Sao Tome and Principe">Sao Tome and Principe</option>
+			        <option value="Saudi Arabia">Saudi Arabia</option>
+			        <option value="Senegal">Senegal</option>
+			        <option value="Serbia and Montenegro">Serbia and Montenegro</option>
+			        <option value="Seychelles">Seychelles</option>
+			        <option value="Sierra Leone">Sierra Leone</option>
+			        <option value="Singapore">Singapore</option>
+			        <option value="Slovakia">Slovakia</option>
+			        <option value="Slovenia">Slovenia</option>
+			        <option value="Solomon Islands">Solomon Islands</option>
+			        <option value="Somalia">Somalia</option>
+			        <option value="South Africa">South Africa</option>
+			        <option value="South Georgia and The South Sandwich Islands">South Georgia and The South Sandwich Islands</option>
+			        <option value="Spain">Spain</option>
+			        <option value="Sri Lanka">Sri Lanka</option>
+			        <option value="Sudan">Sudan</option>
+			        <option value="Suriname">Suriname</option>
+			        <option value="Svalbard and Jan Mayen">Svalbard and Jan Mayen</option>
+			        <option value="Swaziland">Swaziland</option>
+			        <option value="Sweden">Sweden</option>
+			        <option value="Switzerland">Switzerland</option>
+			        <option value="Syrian Arab Republic">Syrian Arab Republic</option>
+			        <option value="Taiwan, Province of China">Taiwan, Province of China</option>
+			        <option value="Tajikistan">Tajikistan</option>
+			        <option value="Tanzania, United Republic of">Tanzania, United Republic of</option>
+			        <option value="Thailand">Thailand</option>
+			        <option value="Timor-leste">Timor-leste</option>
+			        <option value="Togo">Togo</option>
+			        <option value="Tokelau">Tokelau</option>
+			        <option value="Tonga">Tonga</option>
+			        <option value="Trinidad and Tobago">Trinidad and Tobago</option>
+			        <option value="Tunisia">Tunisia</option>
+			        <option value="Turkey">Turkey</option>
+			        <option value="Turkmenistan">Turkmenistan</option>
+			        <option value="Turks and Caicos Islands">Turks and Caicos Islands</option>
+			        <option value="Tuvalu">Tuvalu</option>
+			        <option value="Uganda">Uganda</option>
+			        <option value="Ukraine">Ukraine</option>
+			        <option value="United Arab Emirates">United Arab Emirates</option>
+			        <option value="United Kingdom">United Kingdom</option>
+			        <option value="United States">United States</option>
+			        <option value="United States Minor Outlying Islands">United States Minor Outlying Islands</option>
+			        <option value="Uruguay">Uruguay</option>
+			        <option value="Uzbekistan">Uzbekistan</option>
+			        <option value="Vanuatu">Vanuatu</option>
+			        <option value="Venezuela">Venezuela</option>
+			        <option value="Viet Nam">Viet Nam</option>
+			        <option value="Virgin Islands, British">Virgin Islands, British</option>
+			        <option value="Virgin Islands, U.S.">Virgin Islands, U.S.</option>
+			        <option value="Wallis and Futuna">Wallis and Futuna</option>
+			        <option value="Western Sahara">Western Sahara</option>
+			        <option value="Yemen">Yemen</option>
+			        <option value="Zambia">Zambia</option>
+			        <option value="Zimbabwe">Zimbabwe</option>
+			        </select>		
+				</div>
+			</div>
+      		<br />
+      		<input class="btn" type="submit" value="Next &gt;" />
       </form>
     </div>
   </body>
-</html>
+</html>
\ No newline at end of file
-- 
cgit v1.2.3


From dd1313f68b14b2dbba28ade07ca5e45ca678fc1f Mon Sep 17 00:00:00 2001
From: metoro <mail@benp.net>
Date: Thu, 3 Oct 2013 14:55:54 -0700
Subject: Do some database init

---
 app.coffee | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app.coffee b/app.coffee
index 7e285f22..366b0cc9 100644
--- a/app.coffee
+++ b/app.coffee
@@ -62,3 +62,21 @@ app.use((err, req, res, next) ->
 )
 
 app.listen(3000)
+
+# Setup DB
+db = require("redis").createClient()
+db.sismember("mts","mt:othr", (err,res) ->
+   if !res
+      db.hmset("mt:rest",{code: rest, label: "Restaurant/Bar"}, ->
+          db.sadd("mts","mt:rest")
+      )	  
+      db.hmset("mt:coff",{code: rest, label: "Coffee Shop"}, ->
+          db.sadd("mts","mt:coff")
+      )	
+      db.hmset("mt:othr",{code: rest, label: "Other"}, ->
+          db.sadd("mts","mt:othr")
+      )	         
+      console.log("Added merchant types.")
+)
+
+   
-- 
cgit v1.2.3


From f65ec3fca708e1969d5f8f118d350a5fdf42301a Mon Sep 17 00:00:00 2001
From: metoro <mail@benp.net>
Date: Thu, 3 Oct 2013 15:29:55 -0700
Subject: Skip other

---
 app.coffee | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app.coffee b/app.coffee
index 366b0cc9..72f452ad 100644
--- a/app.coffee
+++ b/app.coffee
@@ -72,10 +72,7 @@ db.sismember("mts","mt:othr", (err,res) ->
       )	  
       db.hmset("mt:coff",{code: rest, label: "Coffee Shop"}, ->
           db.sadd("mts","mt:coff")
-      )	
-      db.hmset("mt:othr",{code: rest, label: "Other"}, ->
-          db.sadd("mts","mt:othr")
-      )	         
+      )	        
       console.log("Added merchant types.")
 )
 
-- 
cgit v1.2.3


From 2ac0bef9c4515eb5e8dd3fabb82357de07932522 Mon Sep 17 00:00:00 2001
From: metoro <mail@benp.net>
Date: Thu, 3 Oct 2013 15:30:31 -0700
Subject: Treat blank as Other for merchant type

---
 views/users/new.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/users/new.html b/views/users/new.html
index f0d87f67..7211c31a 100644
--- a/views/users/new.html
+++ b/views/users/new.html
@@ -44,6 +44,7 @@
 			        	{{#mtypes}}
 			        	<option value="{{code}}">{{label}}</option>
 			        	{{/mtypes}}
+			        	<option value="">Other</option>
 			        </select>
 			        		
 			
-- 
cgit v1.2.3


From f9a21ac2a11054222ebabe0a1a16e5baceef69de Mon Sep 17 00:00:00 2001
From: metoro <mail@benp.net>
Date: Thu, 3 Oct 2013 15:38:15 -0700
Subject: Fix db init

---
 app.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.coffee b/app.coffee
index 72f452ad..5c11feee 100644
--- a/app.coffee
+++ b/app.coffee
@@ -65,7 +65,7 @@ app.listen(3000)
 
 # Setup DB
 db = require("redis").createClient()
-db.sismember("mts","mt:othr", (err,res) ->
+db.sismember("mts","mt:rest", (err,res) ->
    if !res
       db.hmset("mt:rest",{code: rest, label: "Restaurant/Bar"}, ->
           db.sadd("mts","mt:rest")
-- 
cgit v1.2.3


From b55c1a12c5e38432375829354734c13770a4fd45 Mon Sep 17 00:00:00 2001
From: metoro <mail@benp.net>
Date: Thu, 3 Oct 2013 15:39:49 -0700
Subject: Fix db init

---
 app.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.coffee b/app.coffee
index 5c11feee..79dba75e 100644
--- a/app.coffee
+++ b/app.coffee
@@ -67,10 +67,10 @@ app.listen(3000)
 db = require("redis").createClient()
 db.sismember("mts","mt:rest", (err,res) ->
    if !res
-      db.hmset("mt:rest",{code: rest, label: "Restaurant/Bar"}, ->
+      db.hmset("mt:rest",{code: "rest", label: "Restaurant/Bar"}, ->
           db.sadd("mts","mt:rest")
       )	  
-      db.hmset("mt:coff",{code: rest, label: "Coffee Shop"}, ->
+      db.hmset("mt:coff",{code: "rest", label: "Coffee Shop"}, ->
           db.sadd("mts","mt:coff")
       )	        
       console.log("Added merchant types.")
-- 
cgit v1.2.3