push_type_auth 0.10.4 → 0.11.0.beta.1

data/test/dummy/log/test.log

@@ -1,65 +1,65 @@
-  ActiveRecord::InternalMetadata Load (0.7ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", :environment], ["LIMIT", 1]]
+  ActiveRecord::InternalMetadata Load (1.7ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", :environment], ["LIMIT", 1]]
    (0.1ms)  BEGIN
-  SQL (0.3ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES ($1, $2, $3, $4) RETURNING "key"  [["key", "environment"], ["value", "test"], ["created_at", 2017-01-30 11:08:17 UTC], ["updated_at", 2017-01-30 11:08:17 UTC]]
-   (0.6ms)  COMMIT
-  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  SQL (1.1ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES ($1, $2, $3, $4) RETURNING "key"  [["key", "environment"], ["value", "test"], ["created_at", 2017-04-07 12:51:07 UTC], ["updated_at", 2017-04-07 12:51:07 UTC]]
+   (5.7ms)  COMMIT
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
    (0.2ms)  SELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1  [["key", :environment]]
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
    (0.1ms)  SELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1  [["key", :environment]]
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
    (0.1ms)  SELECT "ar_internal_metadata"."value" FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1  [["key", :environment]]
-   (190.9ms)  DROP DATABASE IF EXISTS "dummy_test"
-   (384.6ms)  CREATE DATABASE "dummy_test" ENCODING = 'unicode'
+   (194.3ms)  DROP DATABASE IF EXISTS "dummy_test"
+   (693.5ms)  CREATE DATABASE "dummy_test" ENCODING = 'unicode'
    (3.9ms)  CREATE TABLE "schema_migrations" ("version" character varying PRIMARY KEY)
-   (1.9ms)  CREATE TABLE "ar_internal_metadata" ("key" character varying PRIMARY KEY, "value" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
-   (0.2ms)  SELECT pg_try_advisory_lock(2735718569030447490);
-  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Migrating to CreatePushTypeUsers (20170130110823)
-   (0.1ms)  BEGIN
-  SQL (12.1ms)  CREATE EXTENSION IF NOT EXISTS "uuid-ossp"
-   (13.6ms)  CREATE TABLE "push_type_users" ("id" uuid DEFAULT uuid_generate_v4() PRIMARY KEY, "name" character varying, "email" character varying, "field_store" jsonb, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
-  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170130110823"]]
-   (4.8ms)  COMMIT
-Migrating to CreatePushTypeNodes (20170130110824)
+   (2.1ms)  CREATE TABLE "ar_internal_metadata" ("key" character varying PRIMARY KEY, "value" character varying, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
+   (0.1ms)  SELECT pg_try_advisory_lock(2735718569030447490);
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreatePushTypeUsers (20170407125114)
    (0.1ms)  BEGIN
-   (2.0ms)  CREATE TABLE "push_type_nodes" ("id" uuid DEFAULT uuid_generate_v4() PRIMARY KEY, "type" character varying, "title" character varying, "slug" character varying, "field_store" jsonb, "parent_id" uuid, "sort_order" integer, "status" integer, "published_at" timestamp, "published_to" timestamp, "creator_id" uuid, "updater_id" uuid, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "deleted_at" timestamp)
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170130110824"]]
+  SQL (2.7ms)  CREATE EXTENSION IF NOT EXISTS "uuid-ossp"
+   (3.1ms)  CREATE TABLE "push_type_users" ("id" uuid DEFAULT uuid_generate_v4() PRIMARY KEY, "name" character varying, "email" character varying, "field_store" jsonb, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL)
+  SQL (0.4ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170407125114"]]
+   (0.7ms)  COMMIT
+Migrating to CreatePushTypeNodes (20170407125115)
+   (0.2ms)  BEGIN
+   (3.2ms)  CREATE TABLE "push_type_nodes" ("id" uuid DEFAULT uuid_generate_v4() PRIMARY KEY, "type" character varying, "title" character varying, "slug" character varying, "field_store" jsonb, "parent_id" uuid, "sort_order" integer, "status" integer, "published_at" timestamp, "published_to" timestamp, "creator_id" uuid, "updater_id" uuid, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "deleted_at" timestamp)
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170407125115"]]
    (0.5ms)  COMMIT
-Migrating to CreatePushTypeNodeHierarchies (20170130110825)
+Migrating to CreatePushTypeNodeHierarchies (20170407125116)
    (0.1ms)  BEGIN
-   (0.4ms)  CREATE TABLE "push_type_node_hierarchies" ("ancestor_id" uuid NOT NULL, "descendant_id" uuid NOT NULL, "generations" integer NOT NULL)
+   (0.5ms)  CREATE TABLE "push_type_node_hierarchies" ("ancestor_id" uuid NOT NULL, "descendant_id" uuid NOT NULL, "generations" integer NOT NULL)
    (0.7ms)  CREATE UNIQUE INDEX  "node_anc_desc_idx" ON "push_type_node_hierarchies"  ("ancestor_id", "descendant_id", "generations")
    (0.6ms)  CREATE  INDEX  "node_desc_idx" ON "push_type_node_hierarchies"  ("descendant_id")
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170130110825"]]
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170407125116"]]
    (0.4ms)  COMMIT
-Migrating to CreatePushTypeAssets (20170130110826)
+Migrating to CreatePushTypeAssets (20170407125117)
    (0.1ms)  BEGIN
-   (1.8ms)  CREATE TABLE "push_type_assets" ("id" uuid DEFAULT uuid_generate_v4() PRIMARY KEY, "file_uid" character varying, "file_name" character varying, "file_size" integer, "file_ext" character varying, "mime_type" character varying, "description" character varying, "uploader_id" uuid, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "deleted_at" timestamp)
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170130110826"]]
-   (0.5ms)  COMMIT
-Migrating to AddFieldStoreDefaultValues (20170130110827)
+   (2.1ms)  CREATE TABLE "push_type_assets" ("id" uuid DEFAULT uuid_generate_v4() PRIMARY KEY, "file_uid" character varying, "file_name" character varying, "file_size" integer, "file_ext" character varying, "mime_type" character varying, "description" character varying, "uploader_id" uuid, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL, "deleted_at" timestamp)
+  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170407125117"]]
+   (0.4ms)  COMMIT
+Migrating to AddFieldStoreDefaultValues (20170407125118)
    (0.1ms)  BEGIN
-   (0.3ms)  ALTER TABLE "push_type_nodes" ALTER COLUMN "field_store" TYPE jsonb
+   (0.2ms)  ALTER TABLE "push_type_nodes" ALTER COLUMN "field_store" TYPE jsonb
    (0.2ms)  ALTER TABLE "push_type_nodes" ALTER COLUMN "field_store" SET DEFAULT '{}'
-   (0.2ms)  UPDATE "push_type_nodes" SET "field_store"='{}' WHERE "field_store" IS NULL
+   (0.3ms)  UPDATE "push_type_nodes" SET "field_store"='{}' WHERE "field_store" IS NULL
    (0.1ms)  ALTER TABLE "push_type_nodes" ALTER "field_store" SET NOT NULL
-   (0.2ms)  ALTER TABLE "push_type_users" ALTER COLUMN "field_store" TYPE jsonb
+   (0.6ms)  ALTER TABLE "push_type_users" ALTER COLUMN "field_store" TYPE jsonb
    (0.2ms)  ALTER TABLE "push_type_users" ALTER COLUMN "field_store" SET DEFAULT '{}'
    (0.2ms)  UPDATE "push_type_users" SET "field_store"='{}' WHERE "field_store" IS NULL
    (0.1ms)  ALTER TABLE "push_type_users" ALTER "field_store" SET NOT NULL
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170130110827"]]
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170407125118"]]
    (0.4ms)  COMMIT
-Migrating to DropLegacyPushTypeTaxonomies (20170130110828)
+Migrating to DropLegacyPushTypeTaxonomies (20170407125119)
    (0.1ms)  BEGIN
-  SQL (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170130110828"]]
-   (0.4ms)  COMMIT
-Migrating to DeviseExtendPushTypeUsers (20170130110829)
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170407125119"]]
+   (1.4ms)  COMMIT
+Migrating to DeviseExtendPushTypeUsers (20170407125120)
    (0.1ms)  BEGIN
-   (2.8ms)  ALTER TABLE "push_type_users" ADD "encrypted_password" character varying DEFAULT '' NOT NULL
+   (2.6ms)  ALTER TABLE "push_type_users" ADD "encrypted_password" character varying DEFAULT '' NOT NULL
    (0.2ms)  ALTER TABLE "push_type_users" ADD "reset_password_token" character varying
    (0.1ms)  ALTER TABLE "push_type_users" ADD "reset_password_sent_at" timestamp
    (0.1ms)  ALTER TABLE "push_type_users" ADD "remember_created_at" timestamp
-   (2.1ms)  ALTER TABLE "push_type_users" ADD "sign_in_count" integer DEFAULT 0 NOT NULL
+   (2.2ms)  ALTER TABLE "push_type_users" ADD "sign_in_count" integer DEFAULT 0 NOT NULL
    (0.2ms)  ALTER TABLE "push_type_users" ADD "current_sign_in_at" timestamp
    (0.1ms)  ALTER TABLE "push_type_users" ADD "last_sign_in_at" timestamp
    (0.1ms)  ALTER TABLE "push_type_users" ADD "current_sign_in_ip" character varying
@@ -67,324 +67,155 @@ Migrating to DeviseExtendPushTypeUsers (20170130110829)
    (0.1ms)  ALTER TABLE "push_type_users" ADD "confirmation_token" character varying
    (0.1ms)  ALTER TABLE "push_type_users" ADD "confirmed_at" timestamp
    (0.1ms)  ALTER TABLE "push_type_users" ADD "confirmation_sent_at" timestamp
-   (0.7ms)  CREATE UNIQUE INDEX  "index_push_type_users_on_email" ON "push_type_users"  ("email")
-   (0.6ms)  CREATE UNIQUE INDEX  "index_push_type_users_on_reset_password_token" ON "push_type_users"  ("reset_password_token")
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170130110829"]]
-   (1.1ms)  COMMIT
+   (0.5ms)  CREATE UNIQUE INDEX  "index_push_type_users_on_email" ON "push_type_users"  ("email")
+   (0.8ms)  CREATE UNIQUE INDEX  "index_push_type_users_on_reset_password_token" ON "push_type_users"  ("reset_password_token")
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1) RETURNING "version"  [["version", "20170407125120"]]
+   (1.2ms)  COMMIT
   ActiveRecord::InternalMetadata Load (0.3ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = $1 LIMIT $2  [["key", :environment], ["LIMIT", 1]]
    (0.1ms)  BEGIN
-  SQL (0.2ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES ($1, $2, $3, $4) RETURNING "key"  [["key", "environment"], ["value", "test"], ["created_at", 2017-01-30 11:08:25 UTC], ["updated_at", 2017-01-30 11:08:25 UTC]]
-   (0.5ms)  COMMIT
+  SQL (0.3ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES ($1, $2, $3, $4) RETURNING "key"  [["key", "environment"], ["value", "test"], ["created_at", 2017-04-07 12:51:17 UTC], ["updated_at", 2017-04-07 12:51:17 UTC]]
+   (0.4ms)  COMMIT
    (0.2ms)  SELECT pg_advisory_unlock(2735718569030447490)
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-   (1.8ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
-FROM pg_constraint c
-JOIN pg_class t1 ON c.conrelid = t1.oid
-JOIN pg_class t2 ON c.confrelid = t2.oid
-JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
-JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
-JOIN pg_namespace t3 ON c.connamespace = t3.oid
-WHERE c.contype = 'f'
-  AND t1.relname = 'push_type_assets'
-  AND t3.nspname = ANY (current_schemas(false))
-ORDER BY c.conname
-
-   (1.3ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
-FROM pg_constraint c
-JOIN pg_class t1 ON c.conrelid = t1.oid
-JOIN pg_class t2 ON c.confrelid = t2.oid
-JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
-JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
-JOIN pg_namespace t3 ON c.connamespace = t3.oid
-WHERE c.contype = 'f'
-  AND t1.relname = 'push_type_node_hierarchies'
-  AND t3.nspname = ANY (current_schemas(false))
-ORDER BY c.conname
-
-   (1.3ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
-FROM pg_constraint c
-JOIN pg_class t1 ON c.conrelid = t1.oid
-JOIN pg_class t2 ON c.confrelid = t2.oid
-JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
-JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
-JOIN pg_namespace t3 ON c.connamespace = t3.oid
-WHERE c.contype = 'f'
-  AND t1.relname = 'push_type_nodes'
-  AND t3.nspname = ANY (current_schemas(false))
-ORDER BY c.conname
-
-   (1.2ms)  SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
-FROM pg_constraint c
-JOIN pg_class t1 ON c.conrelid = t1.oid
-JOIN pg_class t2 ON c.confrelid = t2.oid
-JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
-JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
-JOIN pg_namespace t3 ON c.connamespace = t3.oid
-WHERE c.contype = 'f'
-  AND t1.relname = 'push_type_users'
-  AND t3.nspname = ANY (current_schemas(false))
-ORDER BY c.conname
-
   ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
 Creating scope :published. Overwriting existing method PushType::Node.published.
    (0.1ms)  BEGIN
    (0.4ms)  ALTER TABLE "schema_migrations" DISABLE TRIGGER ALL;ALTER TABLE "ar_internal_metadata" DISABLE TRIGGER ALL;ALTER TABLE "push_type_nodes" DISABLE TRIGGER ALL;ALTER TABLE "push_type_node_hierarchies" DISABLE TRIGGER ALL;ALTER TABLE "push_type_assets" DISABLE TRIGGER ALL;ALTER TABLE "push_type_users" DISABLE TRIGGER ALL
    (0.1ms)  COMMIT
-   (1.0ms)            SELECT schemaname || '.' || tablename
+   (1.1ms)            SELECT schemaname || '.' || tablename
           FROM pg_tables
           WHERE
             tablename !~ '_prt_' AND
             tablename <> 'schema_migrations' AND
             schemaname = ANY (current_schemas(false))
 
-   (0.9ms)  select table_name from information_schema.views where table_schema = 'dummy_test'
-   (8.3ms)  TRUNCATE TABLE "public"."ar_internal_metadata", "public"."push_type_nodes", "public"."push_type_node_hierarchies", "public"."push_type_assets", "public"."push_type_users" RESTART IDENTITY CASCADE;
-   (0.1ms)  BEGIN
-   (0.3ms)  ALTER TABLE "schema_migrations" ENABLE TRIGGER ALL;ALTER TABLE "ar_internal_metadata" ENABLE TRIGGER ALL;ALTER TABLE "push_type_node_hierarchies" ENABLE TRIGGER ALL;ALTER TABLE "push_type_assets" ENABLE TRIGGER ALL;ALTER TABLE "push_type_users" ENABLE TRIGGER ALL;ALTER TABLE "push_type_nodes" ENABLE TRIGGER ALL
+   (1.0ms)  select table_name from information_schema.views where table_schema = 'dummy_test'
+   (27.7ms)  TRUNCATE TABLE "public"."ar_internal_metadata", "public"."push_type_nodes", "public"."push_type_node_hierarchies", "public"."push_type_assets", "public"."push_type_users" RESTART IDENTITY CASCADE;
+   (0.2ms)  BEGIN
+   (0.5ms)  ALTER TABLE "schema_migrations" ENABLE TRIGGER ALL;ALTER TABLE "ar_internal_metadata" ENABLE TRIGGER ALL;ALTER TABLE "push_type_node_hierarchies" ENABLE TRIGGER ALL;ALTER TABLE "push_type_assets" ENABLE TRIGGER ALL;ALTER TABLE "push_type_users" ENABLE TRIGGER ALL;ALTER TABLE "push_type_nodes" ENABLE TRIGGER ALL
    (0.1ms)  COMMIT
    (0.1ms)  BEGIN
---------------------------------------------------------------------------------------------------------------
-PushType::AuthenticatableTest::#password_required?::with existing user and dirty password: test_0001_anonymous
---------------------------------------------------------------------------------------------------------------
+---------------------------------------------------------------
+PushType::AuthenticatableTest::confirmable: test_0001_anonymous
+---------------------------------------------------------------
    (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.5ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-1@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-1@example.com"], ["LIMIT", 1]]
-  SQL (1.3ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-1@example.com"], ["created_at", 2017-01-30 11:08:30 UTC], ["updated_at", 2017-01-30 11:08:30 UTC], ["confirmation_token", "CpawkFXMkAMgKRF-kx4v"], ["confirmation_sent_at", 2017-01-30 11:08:30 UTC]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (5.1ms)
-DEPRECATION WARNING on line 78 of /Users/aaron/.rvm/gems/ruby-2.3.1@push_type/gems/foundation-rails-5.5.3.2/vendor/assets/stylesheets/foundation/components/_top-bar.scss: #{} interpolation near operators will be simplified
-in a future version of Sass. To preserve the current behavior, use quotes:
-
-  unquote("#{lower-bound($medium-range)}")
-
-
-Devise::Mailer#confirmation_instructions: processed outbound mail in 12478.5ms
-Sent mail to joe-1@example.com (10.5ms)
-Date: Mon, 30 Jan 2017 11:08:42 +0000
-From: pushtype@example.com
-Reply-To: pushtype@example.com
-To: joe-1@example.com
-Message-ID: <588f1ebab554a_75b23ff6f243f9d09951@Aarons-iMac.local.mail>
-Subject: [PushType] Confirm your account
-Mime-Version: 1.0
-Content-Type: multipart/alternative;
- boundary="--==_mimepart_588f1ebab3e48_75b23ff6f243f9d098d1";
- charset=UTF-8
-Content-Transfer-Encoding: 7bit
-
-
-----==_mimepart_588f1ebab3e48_75b23ff6f243f9d098d1
-Content-Type: text/plain;
- charset=UTF-8
-Content-Transfer-Encoding: 7bit
-
-PushType ( http://localhost:3000/admin/ )
-
-Hello Joe Bloggs
-
-You're receiving this email because a PushType account has been
-created for you.
-
-To get started, confirm your account and set your own password by
-clicking the link below:
-
-Confirm my account 
-( http://localhost:3000/admin/confirmation.47f8c8a3-58e2-49cf-8956-eeb469bc5f3f?confirmation_token=CpawkFXMkAMgKRF-kx4v )
-
-
-PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_588f1ebab3e48_75b23ff6f243f9d098d1
-Content-Type: text/html;
- charset=UTF-8
-Content-Transfer-Encoding: 7bit
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-<head>
-<meta name="viewport" content="width=device-width" />
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>[PushType] Confirm your account</title>
-
-</head>
-
-<body bgcolor="#f6f6f6" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; height: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100% !important;"><style type="text/css">
-img {
-max-width: 100%;
-}
-body {
--webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;
-}
-</style>
-
-<!-- body -->
-<table class="body-wrap" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 20px; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" bgcolor="#FFFFFF" style="border: 1px solid #f0f0f0; clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 20px;">
-
-      <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-      <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
-        </tr>
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
-
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
-
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
-
-<table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.47f8c8a3-58e2-49cf-8956-eeb469bc5f3f?confirmation_token=CpawkFXMkAMgKRF-kx4v" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
-    </td>
-  </tr>
-</table>
-
-
-          </td>
-        </tr>
-      </table>
-      </div>
-      <!-- /content -->
-      
-    </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-  </tr>
-</table>
-<!-- /body -->
-
-<!-- footer -->
-<table class="footer-wrap" style="clear: both !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" style="clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 0;">
-      
-      <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-        <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-          <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <td align="center" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-              <p style="color: #666; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">PushType CMS: <a href="http://www.pushtype.org" style="color: #999; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
-            </td>
-          </tr>
-        </table>
-      </div>
-      <!-- /content -->
-      
-    </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-  </tr>
-</table>
-<!-- /footer -->
-
-</body>
-</html>
-
-----==_mimepart_588f1ebab3e48_75b23ff6f243f9d098d1--
-
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.2ms)  ROLLBACK
+   (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
---------------------------------------------------------------------------------------------
-AuthenticatedApiControllerTest::authenticated with authorization header: test_0001_anonymous
---------------------------------------------------------------------------------------------
+---------------------------------------------------------------------------
+PushType::AuthenticatableTest::database_athenticatable: test_0001_anonymous
+---------------------------------------------------------------------------
    (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-2@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-2@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-2@example.com"], ["created_at", 2017-01-30 11:08:42 UTC], ["updated_at", 2017-01-30 11:08:42 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-01-30 11:08:42 UTC], ["confirmation_sent_at", 2017-01-30 11:08:42 UTC]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Started GET "/api/nodes" for 127.0.0.1 at 2017-01-30 11:08:42 +0000
-Processing by PushType::Api::NodesController#index as JSON
-  PushType::User Load (0.5ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "221c8cac-9c29-4aba-8d1d-c3b892832c42"], ["LIMIT", 1]]
-  Rendering /Users/aaron/dev/pushcode/push_type/api/app/views/push_type/api/nodes/index.json.jbuilder
-  PushType::Node Load (0.5ms)  SELECT  "push_type_nodes".* FROM "push_type_nodes" WHERE "push_type_nodes"."parent_id" IS NULL AND "push_type_nodes"."deleted_at" IS NULL ORDER BY sort_order LIMIT $1 OFFSET $2  [["LIMIT", 30], ["OFFSET", 0]]
-  Rendered collection of /Users/aaron/dev/pushcode/push_type/api/app/views/push_type/api/shared/_pagination.json.jbuilder [0 times] (0.0ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/api/app/views/push_type/api/nodes/index.json.jbuilder (7.9ms)
-Completed 200 OK in 68ms (Views: 35.4ms | ActiveRecord: 1.0ms)
+   (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
--------------------------------------------------------------
-PushType::AuthenticatableTest::trackable: test_0001_anonymous
--------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
+---------------------------------------------------------------------------
+PushType::AuthenticatableTest::database_athenticatable: test_0002_anonymous
+---------------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
+   (0.0ms)  BEGIN
 -----------------------------------------------------------------------------------
 AuthenticatedApiControllerTest::authenticated with token param: test_0001_anonymous
 -----------------------------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-3@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-3@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-3@example.com"], ["created_at", 2017-01-30 11:08:42 UTC], ["updated_at", 2017-01-30 11:08:42 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-01-30 11:08:42 UTC], ["confirmation_sent_at", 2017-01-30 11:08:42 UTC]]
+  PushType::User Exists (0.5ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-1@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-1@example.com"], ["LIMIT", 1]]
+  SQL (1.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-1@example.com"], ["created_at", 2017-04-07 12:51:22 UTC], ["updated_at", 2017-04-07 12:51:22 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-04-07 12:51:22 UTC], ["confirmation_sent_at", 2017-04-07 12:51:22 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
-Started GET "/api/nodes?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE0ODU4NjA5MjIsInN1YiI6ImY0YzhkODJhLWY5ODEtNGVmYi04YzM2LTlmNjEyNTBmMGExYSJ9.9TC8w1GQaEagIBBwcGxhwO3hHumgqEvZEXGKskgKERg" for 127.0.0.1 at 2017-01-30 11:08:42 +0000
+Started GET "/api/nodes?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE0OTE2NTU4ODIsInN1YiI6IjFkODU1YjI3LWRlYjktNDNjMS1iYTNiLWViNjliZDNlZmYyZCJ9.rr5upGmTZFymSc9WtJ7BUoQR0YfJ6iunURo_GnmfVX0" for 127.0.0.1 at 2017-04-07 13:51:22 +0100
 Processing by PushType::Api::NodesController#index as JSON
-  Parameters: {"token"=>"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE0ODU4NjA5MjIsInN1YiI6ImY0YzhkODJhLWY5ODEtNGVmYi04YzM2LTlmNjEyNTBmMGExYSJ9.9TC8w1GQaEagIBBwcGxhwO3hHumgqEvZEXGKskgKERg"}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "f4c8d82a-f981-4efb-8c36-9f61250f0a1a"], ["LIMIT", 1]]
+  Parameters: {"token"=>"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE0OTE2NTU4ODIsInN1YiI6IjFkODU1YjI3LWRlYjktNDNjMS1iYTNiLWViNjliZDNlZmYyZCJ9.rr5upGmTZFymSc9WtJ7BUoQR0YfJ6iunURo_GnmfVX0"}
+  PushType::User Load (0.6ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "1d855b27-deb9-43c1-ba3b-eb69bd3eff2d"], ["LIMIT", 1]]
   Rendering /Users/aaron/dev/pushcode/push_type/api/app/views/push_type/api/nodes/index.json.jbuilder
-  PushType::Node Load (0.3ms)  SELECT  "push_type_nodes".* FROM "push_type_nodes" WHERE "push_type_nodes"."parent_id" IS NULL AND "push_type_nodes"."deleted_at" IS NULL ORDER BY sort_order LIMIT $1 OFFSET $2  [["LIMIT", 30], ["OFFSET", 0]]
+  PushType::Node Load (0.5ms)  SELECT  "push_type_nodes".* FROM "push_type_nodes" WHERE "push_type_nodes"."parent_id" IS NULL AND "push_type_nodes"."deleted_at" IS NULL ORDER BY sort_order LIMIT $1 OFFSET $2  [["LIMIT", 30], ["OFFSET", 0]]
   Rendered collection of /Users/aaron/dev/pushcode/push_type/api/app/views/push_type/api/shared/_pagination.json.jbuilder [0 times] (0.0ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/api/app/views/push_type/api/nodes/index.json.jbuilder (3.5ms)
-Completed 200 OK in 40ms (Views: 31.3ms | ActiveRecord: 0.5ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/api/app/views/push_type/api/nodes/index.json.jbuilder (8.1ms)
+Completed 200 OK in 63ms (Views: 41.1ms | ActiveRecord: 1.1ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
---------------------------------------------------------------------------------------
-PushType::AuthenticatableTest::#password_required?::with new user: test_0001_anonymous
---------------------------------------------------------------------------------------
+-----------------------------------------------------------
+PushType::ApiAuthenticationMethodsTest: test_0003_anonymous
+-----------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------
+PushType::ApiAuthenticationMethodsTest: test_0001_anonymous
+-----------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.0ms)  BEGIN
+-----------------------------------------------------------
+PushType::ApiAuthenticationMethodsTest: test_0002_anonymous
+-----------------------------------------------------------
    (0.0ms)  SAVEPOINT active_record_1
    (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
    (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.0ms)  ROLLBACK
-   (0.0ms)  BEGIN
+   (0.1ms)  BEGIN
+-----------------------------------------------------------
+PushType::ApiAuthenticationMethodsTest: test_0004_anonymous
+-----------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.0ms)  ROLLBACK
+   (0.1ms)  BEGIN
 ----------------------------------------------------------------------------------------
 PushType::ConfirmationsControllerTest::PUT #update::with valid user: test_0001_anonymous
 ----------------------------------------------------------------------------------------
    (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-4@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-4@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-4@example.com"], ["created_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["confirmation_token", "75VYKgCrwMp2v54eWSbz"], ["confirmation_sent_at", 2017-01-30 11:08:43 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-2@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-2@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-2@example.com"], ["created_at", 2017-04-07 12:51:22 UTC], ["updated_at", 2017-04-07 12:51:22 UTC], ["confirmation_token", "Mp2kn-z9WEy1zk3Ty8ye"], ["confirmation_sent_at", 2017-04-07 12:51:22 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.8ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 40.8ms
-Sent mail to joe-4@example.com (3.4ms)
-Date: Mon, 30 Jan 2017 11:08:43 +0000
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (5.2ms)
+DEPRECATION WARNING on line 78 of /Users/aaron/.rvm/gems/ruby-2.3.1@push_type/gems/foundation-rails-5.5.3.2/vendor/assets/stylesheets/foundation/components/_top-bar.scss: #{} interpolation near operators will be simplified
+in a future version of Sass. To preserve the current behavior, use quotes:
+
+  unquote("#{lower-bound($medium-range)}")
+
+
+Devise::Mailer#confirmation_instructions: processed outbound mail in 18097.1ms
+Sent mail to joe-2@example.com (10.0ms)
+Date: Fri, 07 Apr 2017 13:51:40 +0100
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-4@example.com
-Message-ID: <588f1ebb123a8_75b23ff6f243f9d01023f@Aarons-iMac.local.mail>
+To: joe-2@example.com
+Message-ID: <58e78b5c453cd_54863ff8c643f9c8418@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_588f1ebb11f81_75b23ff6f243f9d0101b7";
+ boundary="--==_mimepart_58e78b5c43dee_54863ff8c643f9c835f";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_588f1ebb11f81_75b23ff6f243f9d0101b7
+----==_mimepart_58e78b5c43dee_54863ff8c643f9c835f
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -400,57 +231,56 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/admin/confirmation.3e7913ce-9726-442c-b57e-cd1078dac596?confirmation_token=75VYKgCrwMp2v54eWSbz )
+( http://localhost:3000/admin/confirmation.514f00ba-370b-4422-9f9e-a0ac3887068e?confirmation_token=Mp2kn-z9WEy1zk3Ty8ye )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_588f1ebb11f81_75b23ff6f243f9d0101b7
+----==_mimepart_58e78b5c43dee_54863ff8c643f9c835f
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>[PushType] Confirm your account</title>
 
-</head>
-
-<body bgcolor="#f6f6f6" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; height: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100% !important;"><style type="text/css">
-img {
+<style>img {
 max-width: 100%;
 }
 body {
 -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;
 }
-</style>
+</style></head>
+
+<body bgcolor="#f6f6f6" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0; padding: 0; font-size: 100%; line-height: 1.6; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;">
 
 <!-- body -->
-<table class="body-wrap" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 20px; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" bgcolor="#FFFFFF" style="border: 1px solid #f0f0f0; clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 20px;">
+<table class="body-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 20px;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" bgcolor="#FFFFFF" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 20px; border: 1px solid #f0f0f0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
 
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-      <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+      <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td class="logo" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #348eda; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 100%; margin: 0; padding: 0;" /></a></td>
         </tr>
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
 
-<table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.3e7913ce-9726-442c-b57e-cd1078dac596?confirmation_token=75VYKgCrwMp2v54eWSbz" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+<table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td class="padding" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
+      <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.514f00ba-370b-4422-9f9e-a0ac3887068e?confirmation_token=Mp2kn-z9WEy1zk3Ty8ye" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 10px 0 0; padding: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px; font-size: 100%; line-height: 2; color: #FFF; text-decoration: none; background-color: #348eda; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 25px;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -463,23 +293,23 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /body -->
 
 <!-- footer -->
-<table class="footer-wrap" style="clear: both !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" style="clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 0;">
+<table class="footer-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; padding: 0; margin: 0; clear: both !important;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
       
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-        <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-          <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <td align="center" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-              <p style="color: #666; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">PushType CMS: <a href="http://www.pushtype.org" style="color: #999; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+        <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+          <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <td align="center" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+              <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 12px; line-height: 1.6; color: #666; padding: 0; margin: 0 0 10px; font-weight: normal;">PushType CMS: <a href="http://www.pushtype.org" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #999; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
             </td>
           </tr>
         </table>
@@ -487,7 +317,7 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /footer -->
@@ -495,23 +325,23 @@ body {
 </body>
 </html>
 
-----==_mimepart_588f1ebb11f81_75b23ff6f243f9d0101b7--
+----==_mimepart_58e78b5c43dee_54863ff8c643f9c835f--
 
 Processing by PushType::ConfirmationsController#update as HTML
-  Parameters: {"user"=>{"confirmation_token"=>"75VYKgCrwMp2v54eWSbz", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "75VYKgCrwMp2v54eWSbz"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-4@example.com"], ["id", "3e7913ce-9726-442c-b57e-cd1078dac596"], ["LIMIT", 1]]
+  Parameters: {"user"=>{"confirmation_token"=>"Mp2kn-z9WEy1zk3Ty8ye", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "Mp2kn-z9WEy1zk3Ty8ye"], ["LIMIT", 1]]
+  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-2@example.com"], ["id", "514f00ba-370b-4422-9f9e-a0ac3887068e"], ["LIMIT", 1]]
    (0.1ms)  SAVEPOINT active_record_2
-  SQL (0.2ms)  UPDATE "push_type_users" SET "encrypted_password" = $1, "confirmed_at" = $2, "updated_at" = $3 WHERE "push_type_users"."id" = $4  [["encrypted_password", "$2a$04$WjitcztD5k5zQAZU9iry3OIEzFEqGAJxjtC8nfwY7WtdO6Ewp8OEK"], ["confirmed_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["id", "3e7913ce-9726-442c-b57e-cd1078dac596"]]
+  SQL (0.2ms)  UPDATE "push_type_users" SET "encrypted_password" = $1, "confirmed_at" = $2, "updated_at" = $3 WHERE "push_type_users"."id" = $4  [["encrypted_password", "$2a$04$GX/JLAdvpWhgbe/jPyR/r.mVTUpavyWFwU/Q6qX79CzmNCgnYDMC2"], ["confirmed_at", 2017-04-07 12:51:40 UTC], ["updated_at", 2017-04-07 12:51:40 UTC], ["id", "514f00ba-370b-4422-9f9e-a0ac3887068e"]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
    (0.1ms)  SAVEPOINT active_record_2
-  SQL (0.2ms)  UPDATE "push_type_users" SET "updated_at" = $1, "sign_in_count" = $2, "current_sign_in_at" = $3, "last_sign_in_at" = $4, "current_sign_in_ip" = $5, "last_sign_in_ip" = $6 WHERE "push_type_users"."id" = $7  [["updated_at", 2017-01-30 11:08:43 UTC], ["sign_in_count", 1], ["current_sign_in_at", 2017-01-30 11:08:43 UTC], ["last_sign_in_at", 2017-01-30 11:08:43 UTC], ["current_sign_in_ip", "0.0.0.0"], ["last_sign_in_ip", "0.0.0.0"], ["id", "3e7913ce-9726-442c-b57e-cd1078dac596"]]
+  SQL (0.2ms)  UPDATE "push_type_users" SET "updated_at" = $1, "sign_in_count" = $2, "current_sign_in_at" = $3, "last_sign_in_at" = $4, "current_sign_in_ip" = $5, "last_sign_in_ip" = $6 WHERE "push_type_users"."id" = $7  [["updated_at", 2017-04-07 12:51:40 UTC], ["sign_in_count", 1], ["current_sign_in_at", 2017-04-07 12:51:40 UTC], ["last_sign_in_at", 2017-04-07 12:51:40 UTC], ["current_sign_in_ip", "0.0.0.0"], ["last_sign_in_ip", "0.0.0.0"], ["id", "514f00ba-370b-4422-9f9e-a0ac3887068e"]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
 Redirected to http://test.host/admin/
-Completed 302 Found in 9ms (ActiveRecord: 1.3ms)
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 LIMIT $2  [["id", "3e7913ce-9726-442c-b57e-cd1078dac596"], ["LIMIT", 1]]
+Completed 302 Found in 21ms (ActiveRecord: 1.3ms)
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 LIMIT $2  [["id", "514f00ba-370b-4422-9f9e-a0ac3887068e"], ["LIMIT", 1]]
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
+   (0.2ms)  ROLLBACK
    (0.1ms)  BEGIN
 ----------------------------------------------------------------------------------------
 PushType::ConfirmationsControllerTest::PUT #update::with valid user: test_0002_anonymous
@@ -520,28 +350,28 @@ PushType::ConfirmationsControllerTest::PUT #update::with valid user: test_0002_a
    (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-5@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-5@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-5@example.com"], ["created_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["confirmation_token", "qZmxJo2tt4GhZvQYPiqs"], ["confirmation_sent_at", 2017-01-30 11:08:43 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-3@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-3@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-3@example.com"], ["created_at", 2017-04-07 12:51:40 UTC], ["updated_at", 2017-04-07 12:51:40 UTC], ["confirmation_token", "VNV8GFntCEoCnxqcZMkx"], ["confirmation_sent_at", 2017-04-07 12:51:40 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
   Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 2.5ms
-Sent mail to joe-5@example.com (10.1ms)
-Date: Mon, 30 Jan 2017 11:08:43 +0000
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.6ms
+Sent mail to joe-3@example.com (3.9ms)
+Date: Fri, 07 Apr 2017 13:51:40 +0100
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-5@example.com
-Message-ID: <588f1ebb1f88b_75b23ff6f243f9d01058e@Aarons-iMac.local.mail>
+To: joe-3@example.com
+Message-ID: <58e78b5c561d8_54863ff8c643f9c871c@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_588f1ebb1f362_75b23ff6f243f9d0104de";
+ boundary="--==_mimepart_58e78b5c55d3d_54863ff8c643f9c8650";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_588f1ebb1f362_75b23ff6f243f9d0104de
+----==_mimepart_58e78b5c55d3d_54863ff8c643f9c8650
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -557,57 +387,56 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/admin/confirmation.4b24bbc8-51ec-4dd1-a9b0-12707d42b02b?confirmation_token=qZmxJo2tt4GhZvQYPiqs )
+( http://localhost:3000/admin/confirmation.7efedc14-92a7-459e-8ade-00b8d5d729c0?confirmation_token=VNV8GFntCEoCnxqcZMkx )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_588f1ebb1f362_75b23ff6f243f9d0104de
+----==_mimepart_58e78b5c55d3d_54863ff8c643f9c8650
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>[PushType] Confirm your account</title>
 
-</head>
-
-<body bgcolor="#f6f6f6" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; height: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100% !important;"><style type="text/css">
-img {
+<style>img {
 max-width: 100%;
 }
 body {
 -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;
 }
-</style>
+</style></head>
+
+<body bgcolor="#f6f6f6" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0; padding: 0; font-size: 100%; line-height: 1.6; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;">
 
 <!-- body -->
-<table class="body-wrap" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 20px; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" bgcolor="#FFFFFF" style="border: 1px solid #f0f0f0; clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 20px;">
+<table class="body-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 20px;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" bgcolor="#FFFFFF" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 20px; border: 1px solid #f0f0f0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
 
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-      <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+      <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td class="logo" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #348eda; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 100%; margin: 0; padding: 0;" /></a></td>
         </tr>
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
 
-<table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.4b24bbc8-51ec-4dd1-a9b0-12707d42b02b?confirmation_token=qZmxJo2tt4GhZvQYPiqs" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+<table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td class="padding" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
+      <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.7efedc14-92a7-459e-8ade-00b8d5d729c0?confirmation_token=VNV8GFntCEoCnxqcZMkx" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 10px 0 0; padding: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px; font-size: 100%; line-height: 2; color: #FFF; text-decoration: none; background-color: #348eda; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 25px;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -620,23 +449,23 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /body -->
 
 <!-- footer -->
-<table class="footer-wrap" style="clear: both !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" style="clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 0;">
+<table class="footer-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; padding: 0; margin: 0; clear: both !important;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
       
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-        <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-          <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <td align="center" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-              <p style="color: #666; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">PushType CMS: <a href="http://www.pushtype.org" style="color: #999; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+        <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+          <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <td align="center" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+              <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 12px; line-height: 1.6; color: #666; padding: 0; margin: 0 0 10px; font-weight: normal;">PushType CMS: <a href="http://www.pushtype.org" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #999; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
             </td>
           </tr>
         </table>
@@ -644,7 +473,7 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /footer -->
@@ -652,503 +481,495 @@ body {
 </body>
 </html>
 
-----==_mimepart_588f1ebb1f362_75b23ff6f243f9d0104de--
+----==_mimepart_58e78b5c55d3d_54863ff8c643f9c8650--
 
 Processing by PushType::ConfirmationsController#update as HTML
-  Parameters: {"user"=>{"confirmation_token"=>"qZmxJo2tt4GhZvQYPiqs", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "qZmxJo2tt4GhZvQYPiqs"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-5@example.com"], ["id", "4b24bbc8-51ec-4dd1-a9b0-12707d42b02b"], ["LIMIT", 1]]
+  Parameters: {"user"=>{"confirmation_token"=>"VNV8GFntCEoCnxqcZMkx", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "VNV8GFntCEoCnxqcZMkx"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-3@example.com"], ["id", "7efedc14-92a7-459e-8ade-00b8d5d729c0"], ["LIMIT", 1]]
    (0.1ms)  SAVEPOINT active_record_2
-  SQL (0.2ms)  UPDATE "push_type_users" SET "encrypted_password" = $1, "confirmed_at" = $2, "updated_at" = $3 WHERE "push_type_users"."id" = $4  [["encrypted_password", "$2a$04$EMRLpZkAMshx8OE0mudefewN9wSqdgruN3mjS..9yHvQrI7CQuGg2"], ["confirmed_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["id", "4b24bbc8-51ec-4dd1-a9b0-12707d42b02b"]]
+  SQL (0.2ms)  UPDATE "push_type_users" SET "encrypted_password" = $1, "confirmed_at" = $2, "updated_at" = $3 WHERE "push_type_users"."id" = $4  [["encrypted_password", "$2a$04$V6CmEs4r6aTyzAEVkGRS5eBaahwkFSuanvdKJL17aAJoyBVdmL476"], ["confirmed_at", 2017-04-07 12:51:40 UTC], ["updated_at", 2017-04-07 12:51:40 UTC], ["id", "7efedc14-92a7-459e-8ade-00b8d5d729c0"]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
    (0.1ms)  SAVEPOINT active_record_2
-  SQL (0.2ms)  UPDATE "push_type_users" SET "updated_at" = $1, "sign_in_count" = $2, "current_sign_in_at" = $3, "last_sign_in_at" = $4, "current_sign_in_ip" = $5, "last_sign_in_ip" = $6 WHERE "push_type_users"."id" = $7  [["updated_at", 2017-01-30 11:08:43 UTC], ["sign_in_count", 1], ["current_sign_in_at", 2017-01-30 11:08:43 UTC], ["last_sign_in_at", 2017-01-30 11:08:43 UTC], ["current_sign_in_ip", "0.0.0.0"], ["last_sign_in_ip", "0.0.0.0"], ["id", "4b24bbc8-51ec-4dd1-a9b0-12707d42b02b"]]
+  SQL (0.2ms)  UPDATE "push_type_users" SET "updated_at" = $1, "sign_in_count" = $2, "current_sign_in_at" = $3, "last_sign_in_at" = $4, "current_sign_in_ip" = $5, "last_sign_in_ip" = $6 WHERE "push_type_users"."id" = $7  [["updated_at", 2017-04-07 12:51:40 UTC], ["sign_in_count", 1], ["current_sign_in_at", 2017-04-07 12:51:40 UTC], ["last_sign_in_at", 2017-04-07 12:51:40 UTC], ["current_sign_in_ip", "0.0.0.0"], ["last_sign_in_ip", "0.0.0.0"], ["id", "7efedc14-92a7-459e-8ade-00b8d5d729c0"]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
 Redirected to http://test.host/admin/
-Completed 302 Found in 7ms (ActiveRecord: 1.2ms)
+Completed 302 Found in 7ms (ActiveRecord: 1.1ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
---------------------------------------------------------------------------------------------------------------
-PushType::AuthenticatableTest::#password_required?::with existing user and clean password: test_0001_anonymous
---------------------------------------------------------------------------------------------------------------
+-----------------------------------------------------------------------
+AuthenticatedControllerTest::authenticated request: test_0001_anonymous
+-----------------------------------------------------------------------
    (0.0ms)  SAVEPOINT active_record_1
    (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-6@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-6@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-6@example.com"], ["created_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["confirmation_token", "ixMBhXGutjoTxprE8tCa"], ["confirmation_sent_at", 2017-01-30 11:08:43 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-4@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-4@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "encrypted_password", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-4@example.com"], ["created_at", 2017-04-07 12:51:40 UTC], ["updated_at", 2017-04-07 12:51:40 UTC], ["encrypted_password", "$2a$04$dCCaxb56tKol/3UEbnJ1Z.M84bILAi1UXrFtrR7EXO7rbDogPgOOS"], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-04-07 12:51:40 UTC], ["confirmation_sent_at", 2017-04-07 12:51:40 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 2.6ms
-Sent mail to joe-6@example.com (3.7ms)
-Date: Mon, 30 Jan 2017 11:08:43 +0000
-From: pushtype@example.com
-Reply-To: pushtype@example.com
-To: joe-6@example.com
-Message-ID: <588f1ebb2d08a_75b23ff6f243f9d0108d5@Aarons-iMac.local.mail>
-Subject: [PushType] Confirm your account
-Mime-Version: 1.0
-Content-Type: multipart/alternative;
- boundary="--==_mimepart_588f1ebb2cbdc_75b23ff6f243f9d01077f";
- charset=UTF-8
-Content-Transfer-Encoding: 7bit
-
-
-----==_mimepart_588f1ebb2cbdc_75b23ff6f243f9d01077f
-Content-Type: text/plain;
- charset=UTF-8
-Content-Transfer-Encoding: 7bit
-
-PushType ( http://localhost:3000/admin/ )
-
-Hello Joe Bloggs
-
-You're receiving this email because a PushType account has been
-created for you.
-
-To get started, confirm your account and set your own password by
-clicking the link below:
-
-Confirm my account 
-( http://localhost:3000/admin/confirmation.58df291c-7bc7-401c-9e7d-c3f89b086296?confirmation_token=ixMBhXGutjoTxprE8tCa )
-
-
-PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_588f1ebb2cbdc_75b23ff6f243f9d01077f
-Content-Type: text/html;
- charset=UTF-8
-Content-Transfer-Encoding: 7bit
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-<head>
-<meta name="viewport" content="width=device-width" />
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>[PushType] Confirm your account</title>
-
-</head>
-
-<body bgcolor="#f6f6f6" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; height: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100% !important;"><style type="text/css">
-img {
-max-width: 100%;
-}
-body {
--webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;
-}
-</style>
-
-<!-- body -->
-<table class="body-wrap" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 20px; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" bgcolor="#FFFFFF" style="border: 1px solid #f0f0f0; clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 20px;">
-
-      <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-      <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
-        </tr>
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
-
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
-
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
-
-<table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.58df291c-7bc7-401c-9e7d-c3f89b086296?confirmation_token=ixMBhXGutjoTxprE8tCa" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
-    </td>
-  </tr>
-</table>
-
-
-          </td>
-        </tr>
-      </table>
-      </div>
-      <!-- /content -->
-      
-    </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-  </tr>
-</table>
-<!-- /body -->
-
-<!-- footer -->
-<table class="footer-wrap" style="clear: both !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" style="clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 0;">
-      
-      <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-        <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-          <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <td align="center" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-              <p style="color: #666; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">PushType CMS: <a href="http://www.pushtype.org" style="color: #999; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
-            </td>
-          </tr>
-        </table>
-      </div>
-      <!-- /content -->
-      
-    </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-  </tr>
-</table>
-<!-- /footer -->
-
-</body>
-</html>
-
-----==_mimepart_588f1ebb2cbdc_75b23ff6f243f9d01077f--
-
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
------------------------------------------------------------------------
-AuthenticatedControllerTest::authenticated request: test_0001_anonymous
------------------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-7@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-7@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "encrypted_password", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-7@example.com"], ["created_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["encrypted_password", "$2a$04$3v4sq1JJwvaTsnJnEEqkKOrNitFz850F0Q00dYEqjjIJl0lGRL6jC"], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-01-30 11:08:43 UTC], ["confirmation_sent_at", 2017-01-30 11:08:43 UTC]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Started POST "/admin/sign_in" for 127.0.0.1 at 2017-01-30 11:08:43 +0000
+Started POST "/admin/sign_in" for 127.0.0.1 at 2017-04-07 13:51:40 +0100
 Processing by PushType::SessionsController#create as HTML
-  Parameters: {"user"=>{"email"=>"joe-7@example.com", "password"=>"[FILTERED]"}}
-  PushType::User Load (0.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."email" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["email", "joe-7@example.com"], ["LIMIT", 1]]
+  Parameters: {"user"=>{"email"=>"joe-4@example.com", "password"=>"[FILTERED]"}}
+  PushType::User Load (0.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."email" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["email", "joe-4@example.com"], ["LIMIT", 1]]
    (0.1ms)  SAVEPOINT active_record_2
-  SQL (0.3ms)  UPDATE "push_type_users" SET "current_sign_in_at" = $1, "last_sign_in_at" = $2, "current_sign_in_ip" = $3, "last_sign_in_ip" = $4, "sign_in_count" = $5, "updated_at" = $6 WHERE "push_type_users"."id" = $7  [["current_sign_in_at", 2017-01-30 11:08:43 UTC], ["last_sign_in_at", 2017-01-30 11:08:43 UTC], ["current_sign_in_ip", "127.0.0.1"], ["last_sign_in_ip", "127.0.0.1"], ["sign_in_count", 1], ["updated_at", 2017-01-30 11:08:43 UTC], ["id", "e0cc3e03-b742-432a-8f91-f40cba6274e9"]]
+  SQL (0.2ms)  UPDATE "push_type_users" SET "current_sign_in_at" = $1, "last_sign_in_at" = $2, "current_sign_in_ip" = $3, "last_sign_in_ip" = $4, "sign_in_count" = $5, "updated_at" = $6 WHERE "push_type_users"."id" = $7  [["current_sign_in_at", 2017-04-07 12:51:40 UTC], ["last_sign_in_at", 2017-04-07 12:51:40 UTC], ["current_sign_in_ip", "127.0.0.1"], ["last_sign_in_ip", "127.0.0.1"], ["sign_in_count", 1], ["updated_at", 2017-04-07 12:51:40 UTC], ["id", "de8be328-5d05-4e07-8819-512dcbcc671d"]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
 Redirected to http://www.example.com/admin/
-Completed 302 Found in 65ms (ActiveRecord: 0.8ms)
-Started GET "/admin/nodes" for 127.0.0.1 at 2017-01-30 11:08:43 +0000
+Completed 302 Found in 49ms (ActiveRecord: 0.7ms)
+Started GET "/admin/nodes" for 127.0.0.1 at 2017-04-07 13:51:40 +0100
 Processing by PushType::Admin::NodesController#index as HTML
-  PushType::User Load (0.4ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "e0cc3e03-b742-432a-8f91-f40cba6274e9"], ["LIMIT", 1]]
+  PushType::User Load (0.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "de8be328-5d05-4e07-8819-512dcbcc671d"], ["LIMIT", 1]]
   Rendering /Users/aaron/dev/pushcode/push_type/admin/app/views/push_type/admin/nodes/index.html.haml within layouts/push_type/admin
    (0.3ms)  SELECT COUNT(count_column) FROM (SELECT  1 AS count_column FROM "push_type_nodes" WHERE "push_type_nodes"."parent_id" IS NULL AND "push_type_nodes"."deleted_at" IS NULL LIMIT $1 OFFSET $2) subquery_for_count  [["LIMIT", 30], ["OFFSET", 0]]
    (0.1ms)  SELECT COUNT(*) FROM "push_type_nodes" WHERE "push_type_nodes"."parent_id" IS NULL AND "push_type_nodes"."deleted_at" IS NULL
-  Rendered /Users/aaron/dev/pushcode/push_type/admin/app/views/push_type/admin/nodes/_new_node_button.html.haml (2.0ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/admin/app/views/push_type/admin/nodes/index.html.haml within layouts/push_type/admin (21.9ms)
-Completed 200 OK in 41ms (Views: 33.5ms | ActiveRecord: 0.8ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
---------------------------------------------------------------------------------------------
-PushType::Admin::ProfilesControllerTest::PUT #update::with invalid user: test_0001_anonymous
---------------------------------------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  RELEASE SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-8@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-8@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-8@example.com"], ["created_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-01-30 11:08:43 UTC], ["confirmation_sent_at", 2017-01-30 11:08:43 UTC]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::Admin::ProfilesController#update as HTML
-  Parameters: {"user"=>{"name"=>""}}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "2571a69f-3708-4700-b92a-a6e0f7c7f00b"], ["LIMIT", 1]]
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-8@example.com"], ["id", "2571a69f-3708-4700-b92a-a6e0f7c7f00b"], ["LIMIT", 1]]
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_2
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin (14.9ms)
-Completed 200 OK in 30ms (Views: 25.0ms | ActiveRecord: 0.6ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/admin/app/views/push_type/admin/nodes/_new_node_button.html.haml (2.1ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/admin/app/views/push_type/admin/nodes/index.html.haml within layouts/push_type/admin (22.2ms)
+Completed 200 OK in 43ms (Views: 34.0ms | ActiveRecord: 0.8ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
---------------------------------------------------------------------------------------------
-PushType::Admin::ProfilesControllerTest::PUT #update::with invalid user: test_0002_anonymous
---------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------
+AuthenticatedControllerTest::unauthenticated request: test_0001_anonymous
+-------------------------------------------------------------------------
    (0.0ms)  SAVEPOINT active_record_1
    (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-9@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-9@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-9@example.com"], ["created_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-01-30 11:08:43 UTC], ["confirmation_sent_at", 2017-01-30 11:08:43 UTC]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::Admin::ProfilesController#update as HTML
-  Parameters: {"user"=>{"name"=>""}}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "c9aa91a6-1980-457a-864f-344dab7499d1"], ["LIMIT", 1]]
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-9@example.com"], ["id", "c9aa91a6-1980-457a-864f-344dab7499d1"], ["LIMIT", 1]]
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_2
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin (1.8ms)
-Completed 200 OK in 11ms (Views: 7.4ms | ActiveRecord: 0.5ms)
+Started GET "/admin/nodes" for 127.0.0.1 at 2017-04-07 13:51:40 +0100
+Processing by PushType::Admin::NodesController#index as HTML
+Redirected to http://www.example.com/admin/sign_in
+Filter chain halted as :authenticate_user! rendered or redirected
+Completed 302 Found in 1ms (ActiveRecord: 0.0ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
----------------------------------------------------------------
-PushType::AuthenticatableTest::recoverable: test_0001_anonymous
----------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.0ms)  BEGIN
 ------------------------------------------------------------------------------------------
 PushType::Admin::ProfilesControllerTest::PUT #update::with valid user: test_0003_anonymous
 ------------------------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-10@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-10@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-10@example.com"], ["created_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-01-30 11:08:43 UTC], ["confirmation_sent_at", 2017-01-30 11:08:43 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-5@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-5@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-5@example.com"], ["created_at", 2017-04-07 12:51:40 UTC], ["updated_at", 2017-04-07 12:51:40 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-04-07 12:51:40 UTC], ["confirmation_sent_at", 2017-04-07 12:51:40 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
 Processing by PushType::Admin::ProfilesController#update as HTML
   Parameters: {"user"=>{"name"=>"Test user ABC"}}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "8735dbe4-7f44-4a62-8459-ea85dfa009b5"], ["LIMIT", 1]]
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "bc0b4982-936f-4240-b50f-e7140ce19298"], ["LIMIT", 1]]
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-10@example.com"], ["id", "8735dbe4-7f44-4a62-8459-ea85dfa009b5"], ["LIMIT", 1]]
-  SQL (0.2ms)  UPDATE "push_type_users" SET "name" = $1, "updated_at" = $2 WHERE "push_type_users"."id" = $3  [["name", "Test user ABC"], ["updated_at", 2017-01-30 11:08:43 UTC], ["id", "8735dbe4-7f44-4a62-8459-ea85dfa009b5"]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-5@example.com"], ["id", "bc0b4982-936f-4240-b50f-e7140ce19298"], ["LIMIT", 1]]
+  SQL (0.2ms)  UPDATE "push_type_users" SET "name" = $1, "updated_at" = $2 WHERE "push_type_users"."id" = $3  [["name", "Test user ABC"], ["updated_at", 2017-04-07 12:51:40 UTC], ["id", "bc0b4982-936f-4240-b50f-e7140ce19298"]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
 Redirected to http://test.host/admin/profile/edit
-Completed 302 Found in 4ms (ActiveRecord: 0.7ms)
+Completed 302 Found in 5ms (ActiveRecord: 0.7ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
 ------------------------------------------------------------------------------------------
-PushType::Admin::ProfilesControllerTest::PUT #update::with valid user: test_0002_anonymous
+PushType::Admin::ProfilesControllerTest::PUT #update::with valid user: test_0001_anonymous
 ------------------------------------------------------------------------------------------
    (0.1ms)  SAVEPOINT active_record_1
    (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-11@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-11@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-11@example.com"], ["created_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-01-30 11:08:43 UTC], ["confirmation_sent_at", 2017-01-30 11:08:43 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-6@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-6@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-6@example.com"], ["created_at", 2017-04-07 12:51:40 UTC], ["updated_at", 2017-04-07 12:51:40 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-04-07 12:51:40 UTC], ["confirmation_sent_at", 2017-04-07 12:51:40 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
 Processing by PushType::Admin::ProfilesController#update as HTML
   Parameters: {"user"=>{"name"=>"Test user ABC"}}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "f73fce6c-00f3-46a3-abb6-3f5ac8adeffe"], ["LIMIT", 1]]
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "9e786200-01ea-4bcf-b2d8-aef55d019b8d"], ["LIMIT", 1]]
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-11@example.com"], ["id", "f73fce6c-00f3-46a3-abb6-3f5ac8adeffe"], ["LIMIT", 1]]
-  SQL (0.2ms)  UPDATE "push_type_users" SET "name" = $1, "updated_at" = $2 WHERE "push_type_users"."id" = $3  [["name", "Test user ABC"], ["updated_at", 2017-01-30 11:08:43 UTC], ["id", "f73fce6c-00f3-46a3-abb6-3f5ac8adeffe"]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-6@example.com"], ["id", "9e786200-01ea-4bcf-b2d8-aef55d019b8d"], ["LIMIT", 1]]
+  SQL (0.2ms)  UPDATE "push_type_users" SET "name" = $1, "updated_at" = $2 WHERE "push_type_users"."id" = $3  [["name", "Test user ABC"], ["updated_at", 2017-04-07 12:51:40 UTC], ["id", "9e786200-01ea-4bcf-b2d8-aef55d019b8d"]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
 Redirected to http://test.host/admin/profile/edit
-Completed 302 Found in 5ms (ActiveRecord: 0.8ms)
+Completed 302 Found in 4ms (ActiveRecord: 0.7ms)
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 LIMIT $2  [["id", "9e786200-01ea-4bcf-b2d8-aef55d019b8d"], ["LIMIT", 1]]
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
 ------------------------------------------------------------------------------------------
-PushType::Admin::ProfilesControllerTest::PUT #update::with valid user: test_0001_anonymous
+PushType::Admin::ProfilesControllerTest::PUT #update::with valid user: test_0002_anonymous
 ------------------------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-12@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-12@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-12@example.com"], ["created_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-01-30 11:08:43 UTC], ["confirmation_sent_at", 2017-01-30 11:08:43 UTC]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-7@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-7@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-7@example.com"], ["created_at", 2017-04-07 12:51:40 UTC], ["updated_at", 2017-04-07 12:51:40 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-04-07 12:51:40 UTC], ["confirmation_sent_at", 2017-04-07 12:51:40 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
 Processing by PushType::Admin::ProfilesController#update as HTML
   Parameters: {"user"=>{"name"=>"Test user ABC"}}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "1dfc82be-925f-44d1-85f2-e430e0bd6e59"], ["LIMIT", 1]]
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "b4de7940-3759-4a4b-8a8c-66a907add74d"], ["LIMIT", 1]]
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-12@example.com"], ["id", "1dfc82be-925f-44d1-85f2-e430e0bd6e59"], ["LIMIT", 1]]
-  SQL (0.2ms)  UPDATE "push_type_users" SET "name" = $1, "updated_at" = $2 WHERE "push_type_users"."id" = $3  [["name", "Test user ABC"], ["updated_at", 2017-01-30 11:08:43 UTC], ["id", "1dfc82be-925f-44d1-85f2-e430e0bd6e59"]]
+  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-7@example.com"], ["id", "b4de7940-3759-4a4b-8a8c-66a907add74d"], ["LIMIT", 1]]
+  SQL (0.2ms)  UPDATE "push_type_users" SET "name" = $1, "updated_at" = $2 WHERE "push_type_users"."id" = $3  [["name", "Test user ABC"], ["updated_at", 2017-04-07 12:51:40 UTC], ["id", "b4de7940-3759-4a4b-8a8c-66a907add74d"]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
 Redirected to http://test.host/admin/profile/edit
-Completed 302 Found in 4ms (ActiveRecord: 0.7ms)
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 LIMIT $2  [["id", "1dfc82be-925f-44d1-85f2-e430e0bd6e59"], ["LIMIT", 1]]
+Completed 302 Found in 5ms (ActiveRecord: 0.8ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
-------------------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::GET #show::with invalid confirmation token: test_0001_anonymous
-------------------------------------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
+----------------------------------------------------------------------------------------------------
+PushType::ConfirmationsControllerTest::GET #show::with valid confirmation token: test_0001_anonymous
+----------------------------------------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-8@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-8@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-8@example.com"], ["created_at", 2017-04-07 12:51:40 UTC], ["updated_at", 2017-04-07 12:51:40 UTC], ["confirmation_token", "U5cHawRUcPYYEiPXeG_q"], ["confirmation_sent_at", 2017-04-07 12:51:40 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.7ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 39.5ms
+Sent mail to joe-8@example.com (3.8ms)
+Date: Fri, 07 Apr 2017 13:51:40 +0100
+From: pushtype@example.com
+Reply-To: pushtype@example.com
+To: joe-8@example.com
+Message-ID: <58e78b5c94b75_54863ff8c643f9c810b3@Aarons-iMac.local.mail>
+Subject: [PushType] Confirm your account
+Mime-Version: 1.0
+Content-Type: multipart/alternative;
+ boundary="--==_mimepart_58e78b5c946d9_54863ff8c643f9c8962";
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+
+----==_mimepart_58e78b5c946d9_54863ff8c643f9c8962
+Content-Type: text/plain;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+PushType ( http://localhost:3000/admin/ )
+
+Hello Joe Bloggs
+
+You're receiving this email because a PushType account has been
+created for you.
+
+To get started, confirm your account and set your own password by
+clicking the link below:
+
+Confirm my account 
+( http://localhost:3000/admin/confirmation.e871e4dc-018a-4a3b-8ea5-1bd4d4f4f5a0?confirmation_token=U5cHawRUcPYYEiPXeG_q )
+
+
+PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
+----==_mimepart_58e78b5c946d9_54863ff8c643f9c8962
+Content-Type: text/html;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+<head>
+<meta name="viewport" content="width=device-width" />
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>[PushType] Confirm your account</title>
+
+<style>img {
+max-width: 100%;
+}
+body {
+-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;
+}
+</style></head>
+
+<body bgcolor="#f6f6f6" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0; padding: 0; font-size: 100%; line-height: 1.6; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;">
+
+<!-- body -->
+<table class="body-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 20px;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" bgcolor="#FFFFFF" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 20px; border: 1px solid #f0f0f0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
+
+      <!-- content -->
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+      <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td class="logo" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #348eda; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 100%; margin: 0; padding: 0;" /></a></td>
+        </tr>
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
+
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
+
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
+
+<table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td class="padding" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
+      <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.e871e4dc-018a-4a3b-8ea5-1bd4d4f4f5a0?confirmation_token=U5cHawRUcPYYEiPXeG_q" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 10px 0 0; padding: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px; font-size: 100%; line-height: 2; color: #FFF; text-decoration: none; background-color: #348eda; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 25px;">Confirm my account</a></p>
+    </td>
+  </tr>
+</table>
+
+
+          </td>
+        </tr>
+      </table>
+      </div>
+      <!-- /content -->
+      
+    </td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+  </tr>
+</table>
+<!-- /body -->
+
+<!-- footer -->
+<table class="footer-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; padding: 0; margin: 0; clear: both !important;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
+      
+      <!-- content -->
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+        <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+          <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <td align="center" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+              <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 12px; line-height: 1.6; color: #666; padding: 0; margin: 0 0 10px; font-weight: normal;">PushType CMS: <a href="http://www.pushtype.org" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #999; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <!-- /content -->
+      
+    </td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+  </tr>
+</table>
+<!-- /footer -->
+
+</body>
+</html>
+
+----==_mimepart_58e78b5c946d9_54863ff8c643f9c8962--
+
 Processing by PushType::ConfirmationsController#show as HTML
-  Parameters: {"confirmation_token"=>"invalid"}
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "invalid"], ["LIMIT", 1]]
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "invalid"], ["LIMIT", 1]]
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "20ff98320b86f376d97a8f714d07f35030940cd97ebf0bbc6a1b4b8e352d4e74"], ["LIMIT", 1]]
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/new.html.haml within layouts/push_type/auth
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (1.0ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/new.html.haml within layouts/push_type/auth (6.5ms)
-Completed 200 OK in 194ms (Views: 18.7ms | ActiveRecord: 0.5ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
-------------------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::GET #show::with invalid confirmation token: test_0002_anonymous
-------------------------------------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
+  Parameters: {"confirmation_token"=>"U5cHawRUcPYYEiPXeG_q"}
+  PushType::User Load (0.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "U5cHawRUcPYYEiPXeG_q"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (1.3ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (21.4ms)
+Completed 200 OK in 38ms (Views: 31.7ms | ActiveRecord: 0.3ms)
+   (0.4ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.3ms)  ROLLBACK
+   (0.2ms)  BEGIN
+----------------------------------------------------------------------------------------------------
+PushType::ConfirmationsControllerTest::GET #show::with valid confirmation token: test_0002_anonymous
+----------------------------------------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.2ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-9@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-9@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-9@example.com"], ["created_at", 2017-04-07 12:51:40 UTC], ["updated_at", 2017-04-07 12:51:40 UTC], ["confirmation_token", "rfS7sx7oj1o7-3FyesK2"], ["confirmation_sent_at", 2017-04-07 12:51:40 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 3.3ms
+Sent mail to joe-9@example.com (3.5ms)
+Date: Fri, 07 Apr 2017 13:51:40 +0100
+From: pushtype@example.com
+Reply-To: pushtype@example.com
+To: joe-9@example.com
+Message-ID: <58e78b5caa1a1_54863ff8c643f9c8132e@Aarons-iMac.local.mail>
+Subject: [PushType] Confirm your account
+Mime-Version: 1.0
+Content-Type: multipart/alternative;
+ boundary="--==_mimepart_58e78b5ca9d5b_54863ff8c643f9c812da";
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+
+----==_mimepart_58e78b5ca9d5b_54863ff8c643f9c812da
+Content-Type: text/plain;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+PushType ( http://localhost:3000/admin/ )
+
+Hello Joe Bloggs
+
+You're receiving this email because a PushType account has been
+created for you.
+
+To get started, confirm your account and set your own password by
+clicking the link below:
+
+Confirm my account 
+( http://localhost:3000/admin/confirmation.d655b0e7-7531-4170-ad49-9ac31756450a?confirmation_token=rfS7sx7oj1o7-3FyesK2 )
+
+
+PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
+----==_mimepart_58e78b5ca9d5b_54863ff8c643f9c812da
+Content-Type: text/html;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+<head>
+<meta name="viewport" content="width=device-width" />
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>[PushType] Confirm your account</title>
+
+<style>img {
+max-width: 100%;
+}
+body {
+-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;
+}
+</style></head>
+
+<body bgcolor="#f6f6f6" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0; padding: 0; font-size: 100%; line-height: 1.6; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;">
+
+<!-- body -->
+<table class="body-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 20px;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" bgcolor="#FFFFFF" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 20px; border: 1px solid #f0f0f0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
+
+      <!-- content -->
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+      <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td class="logo" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #348eda; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 100%; margin: 0; padding: 0;" /></a></td>
+        </tr>
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
+
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
+
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
+
+<table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td class="padding" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
+      <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.d655b0e7-7531-4170-ad49-9ac31756450a?confirmation_token=rfS7sx7oj1o7-3FyesK2" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 10px 0 0; padding: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px; font-size: 100%; line-height: 2; color: #FFF; text-decoration: none; background-color: #348eda; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 25px;">Confirm my account</a></p>
+    </td>
+  </tr>
+</table>
+
+
+          </td>
+        </tr>
+      </table>
+      </div>
+      <!-- /content -->
+      
+    </td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+  </tr>
+</table>
+<!-- /body -->
+
+<!-- footer -->
+<table class="footer-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; padding: 0; margin: 0; clear: both !important;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
+      
+      <!-- content -->
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+        <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+          <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <td align="center" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+              <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 12px; line-height: 1.6; color: #666; padding: 0; margin: 0 0 10px; font-weight: normal;">PushType CMS: <a href="http://www.pushtype.org" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #999; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <!-- /content -->
+      
+    </td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+  </tr>
+</table>
+<!-- /footer -->
+
+</body>
+</html>
+
+----==_mimepart_58e78b5ca9d5b_54863ff8c643f9c812da--
+
 Processing by PushType::ConfirmationsController#show as HTML
-  Parameters: {"confirmation_token"=>"invalid"}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "invalid"], ["LIMIT", 1]]
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "invalid"], ["LIMIT", 1]]
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "20ff98320b86f376d97a8f714d07f35030940cd97ebf0bbc6a1b4b8e352d4e74"], ["LIMIT", 1]]
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/new.html.haml within layouts/push_type/auth
+  Parameters: {"confirmation_token"=>"rfS7sx7oj1o7-3FyesK2"}
+  PushType::User Load (0.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "rfS7sx7oj1o7-3FyesK2"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth
   Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.3ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/new.html.haml within layouts/push_type/auth (1.4ms)
-Completed 200 OK in 8ms (Views: 5.3ms | ActiveRecord: 0.3ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (1.9ms)
+Completed 200 OK in 8ms (Views: 6.9ms | ActiveRecord: 0.3ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.0ms)  BEGIN
------------------------------------------------------------
-PushType::ApiAuthenticationMethodsTest: test_0002_anonymous
------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK
-   (0.1ms)  BEGIN
------------------------------------------------------------
-PushType::ApiAuthenticationMethodsTest: test_0003_anonymous
------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK
-   (0.1ms)  BEGIN
------------------------------------------------------------
-PushType::ApiAuthenticationMethodsTest: test_0004_anonymous
------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK
-   (0.1ms)  BEGIN
------------------------------------------------------------
-PushType::ApiAuthenticationMethodsTest: test_0001_anonymous
------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK
-   (0.0ms)  BEGIN
-----------------------------------------------------------------------------
-AuthenticatedApiControllerTest::unauthenticated request: test_0001_anonymous
-----------------------------------------------------------------------------
+----------------------------------------------------------------
+PushType::AuthenticatableTest::rememberable: test_0001_anonymous
+----------------------------------------------------------------
    (0.0ms)  SAVEPOINT active_record_1
    (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
-Started GET "/api/nodes" for 127.0.0.1 at 2017-01-30 11:08:43 +0000
-Processing by PushType::Api::NodesController#index as JSON
-Filter chain halted as :authenticate_user! rendered or redirected
-Completed 401 Unauthorized in 1ms (ActiveRecord: 0.0ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
-----------------------------------------------------
-PushType::InvitationMethodsTest: test_0001_anonymous
-----------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK
-   (0.0ms)  BEGIN
----------------------------------------------------------------
-PushType::AuthenticatableTest::validatable: test_0001_anonymous
----------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
+-------------------------------------------------------------
+PushType::AuthenticatableTest::trackable: test_0001_anonymous
+-------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
+   (0.0ms)  BEGIN
 ---------------------------------------------------------------
-PushType::AuthenticatableTest::validatable: test_0002_anonymous
+PushType::AuthenticatableTest::recoverable: test_0001_anonymous
 ---------------------------------------------------------------
    (0.0ms)  SAVEPOINT active_record_1
    (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.0ms)  BEGIN
------------------------------------------------------------------------
-PushType::Admin::ProfilesControllerTest::GET #edit: test_0001_anonymous
------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-13@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-13@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-13@example.com"], ["created_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-01-30 11:08:43 UTC], ["confirmation_sent_at", 2017-01-30 11:08:43 UTC]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::Admin::ProfilesController#edit as HTML
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "8309edf5-ec76-454e-87a5-83b44a12ab05"], ["LIMIT", 1]]
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin (5.2ms)
-Completed 200 OK in 21ms (Views: 16.9ms | ActiveRecord: 0.2ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
------------------------------------------------------------------------
-PushType::Admin::ProfilesControllerTest::GET #edit: test_0002_anonymous
------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-14@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-14@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-14@example.com"], ["created_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-01-30 11:08:43 UTC], ["confirmation_sent_at", 2017-01-30 11:08:43 UTC]]
-   (0.1ms)  RELEASE SAVEPOINT active_record_2
-Processing by PushType::Admin::ProfilesController#edit as HTML
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "96101f14-7f39-48c0-94dc-282e0a8e547b"], ["LIMIT", 1]]
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin (2.0ms)
-Completed 200 OK in 9ms (Views: 8.0ms | ActiveRecord: 0.1ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
-----------------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::GET #show::with valid confirmation token: test_0002_anonymous
-----------------------------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------------------
+PushType::AuthenticatableTest::#password_required?::with existing user and dirty password: test_0001_anonymous
+--------------------------------------------------------------------------------------------------------------
    (0.0ms)  SAVEPOINT active_record_1
    (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-15@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-15@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-15@example.com"], ["created_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["confirmation_token", "KKEYKiBoAR9mcA7igu9x"], ["confirmation_sent_at", 2017-01-30 11:08:43 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-10@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-10@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-10@example.com"], ["created_at", 2017-04-07 12:51:40 UTC], ["updated_at", 2017-04-07 12:51:40 UTC], ["confirmation_token", "3z6PayP1zmM8J5B3dFcU"], ["confirmation_sent_at", 2017-04-07 12:51:40 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.7ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 37.7ms
-Sent mail to joe-15@example.com (3.5ms)
-Date: Mon, 30 Jan 2017 11:08:43 +0000
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.4ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 3.3ms
+Sent mail to joe-10@example.com (4.0ms)
+Date: Fri, 07 Apr 2017 13:51:40 +0100
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-15@example.com
-Message-ID: <588f1ebbbcd99_75b23ff6f243f9d011138@Aarons-iMac.local.mail>
+To: joe-10@example.com
+Message-ID: <58e78b5cba835_54863ff8c643f9c81674@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_588f1ebbbc904_75b23ff6f243f9d0110d2";
+ boundary="--==_mimepart_58e78b5cba2d1_54863ff8c643f9c81561";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_588f1ebbbc904_75b23ff6f243f9d0110d2
+----==_mimepart_58e78b5cba2d1_54863ff8c643f9c81561
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1164,57 +985,56 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/admin/confirmation.78ae17ec-a9c5-4484-8b79-1742ce92057e?confirmation_token=KKEYKiBoAR9mcA7igu9x )
+( http://localhost:3000/admin/confirmation.77d119ef-d8a3-479c-9aba-f1e2e70f1f5a?confirmation_token=3z6PayP1zmM8J5B3dFcU )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_588f1ebbbc904_75b23ff6f243f9d0110d2
+----==_mimepart_58e78b5cba2d1_54863ff8c643f9c81561
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>[PushType] Confirm your account</title>
 
-</head>
-
-<body bgcolor="#f6f6f6" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; height: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100% !important;"><style type="text/css">
-img {
+<style>img {
 max-width: 100%;
 }
 body {
 -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;
 }
-</style>
+</style></head>
+
+<body bgcolor="#f6f6f6" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0; padding: 0; font-size: 100%; line-height: 1.6; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;">
 
 <!-- body -->
-<table class="body-wrap" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 20px; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" bgcolor="#FFFFFF" style="border: 1px solid #f0f0f0; clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 20px;">
+<table class="body-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 20px;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" bgcolor="#FFFFFF" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 20px; border: 1px solid #f0f0f0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
 
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-      <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+      <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td class="logo" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #348eda; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 100%; margin: 0; padding: 0;" /></a></td>
         </tr>
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
 
-<table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.78ae17ec-a9c5-4484-8b79-1742ce92057e?confirmation_token=KKEYKiBoAR9mcA7igu9x" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+<table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td class="padding" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
+      <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.77d119ef-d8a3-479c-9aba-f1e2e70f1f5a?confirmation_token=3z6PayP1zmM8J5B3dFcU" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 10px 0 0; padding: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px; font-size: 100%; line-height: 2; color: #FFF; text-decoration: none; background-color: #348eda; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 25px;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -1227,23 +1047,23 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /body -->
 
 <!-- footer -->
-<table class="footer-wrap" style="clear: both !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" style="clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 0;">
+<table class="footer-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; padding: 0; margin: 0; clear: both !important;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
       
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-        <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-          <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <td align="center" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-              <p style="color: #666; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">PushType CMS: <a href="http://www.pushtype.org" style="color: #999; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+        <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+          <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <td align="center" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+              <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 12px; line-height: 1.6; color: #666; padding: 0; margin: 0 0 10px; font-weight: normal;">PushType CMS: <a href="http://www.pushtype.org" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #999; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
             </td>
           </tr>
         </table>
@@ -1251,7 +1071,7 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /footer -->
@@ -1259,47 +1079,136 @@ body {
 </body>
 </html>
 
-----==_mimepart_588f1ebbbc904_75b23ff6f243f9d0110d2--
+----==_mimepart_58e78b5cba2d1_54863ff8c643f9c81561--
 
-Processing by PushType::ConfirmationsController#show as HTML
-  Parameters: {"confirmation_token"=>"KKEYKiBoAR9mcA7igu9x"}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "KKEYKiBoAR9mcA7igu9x"], ["LIMIT", 1]]
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.9ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (7.3ms)
-Completed 200 OK in 19ms (Views: 14.4ms | ActiveRecord: 0.2ms)
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------------------
+PushType::Admin::ProfilesControllerTest::GET #edit: test_0001_anonymous
+-----------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-11@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-11@example.com"], ["LIMIT", 1]]
+  SQL (0.3ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-11@example.com"], ["created_at", 2017-04-07 12:51:40 UTC], ["updated_at", 2017-04-07 12:51:40 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-04-07 12:51:40 UTC], ["confirmation_sent_at", 2017-04-07 12:51:40 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::Admin::ProfilesController#edit as HTML
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "978429f4-16dd-4a08-92f6-fe5b7b45943e"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin (9.5ms)
+Completed 200 OK in 31ms (Views: 25.2ms | ActiveRecord: 0.2ms)
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+-----------------------------------------------------------------------
+PushType::Admin::ProfilesControllerTest::GET #edit: test_0002_anonymous
+-----------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-12@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-12@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-12@example.com"], ["created_at", 2017-04-07 12:51:40 UTC], ["updated_at", 2017-04-07 12:51:40 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-04-07 12:51:40 UTC], ["confirmation_sent_at", 2017-04-07 12:51:40 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::Admin::ProfilesController#edit as HTML
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "0663f66a-a754-4eee-abd0-36d71621ef1d"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin (2.3ms)
+Completed 200 OK in 13ms (Views: 11.4ms | ActiveRecord: 0.2ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------
+PushType::AuthenticationMethodsTest: test_0002_anonymous
+--------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.0ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------
+PushType::AuthenticationMethodsTest: test_0001_anonymous
+--------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.0ms)  ROLLBACK
+   (0.0ms)  BEGIN
+--------------------------------------------------------------------------------------
+PushType::AuthenticatableTest::#password_required?::with new user: test_0001_anonymous
+--------------------------------------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------
+PushType::AuthenticatableTest::validatable: test_0001_anonymous
+---------------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+---------------------------------------------------------------
+PushType::AuthenticatableTest::validatable: test_0002_anonymous
+---------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+----------------------------------------------------------------------------
+AuthenticatedApiControllerTest::unauthenticated request: test_0001_anonymous
+----------------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+Started GET "/api/nodes" for 127.0.0.1 at 2017-04-07 13:51:40 +0100
+Processing by PushType::Api::NodesController#index as JSON
+Filter chain halted as :authenticate_user! rendered or redirected
+Completed 401 Unauthorized in 1ms (ActiveRecord: 0.0ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
-----------------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::GET #show::with valid confirmation token: test_0001_anonymous
-----------------------------------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------------------
+PushType::AuthenticatableTest::#password_required?::with existing user and clean password: test_0001_anonymous
+--------------------------------------------------------------------------------------------------------------
    (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-16@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-16@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-16@example.com"], ["created_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["confirmation_token", "pxDUPyV8RJyxm7uePyxj"], ["confirmation_sent_at", 2017-01-30 11:08:43 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-13@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-13@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-13@example.com"], ["created_at", 2017-04-07 12:51:40 UTC], ["updated_at", 2017-04-07 12:51:40 UTC], ["confirmation_token", "Zg4wwsFvHYiJpyTJzsRN"], ["confirmation_sent_at", 2017-04-07 12:51:40 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 3.4ms
-Sent mail to joe-16@example.com (4.0ms)
-Date: Mon, 30 Jan 2017 11:08:43 +0000
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.9ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 44.6ms
+Sent mail to joe-13@example.com (4.9ms)
+Date: Fri, 07 Apr 2017 13:51:40 +0100
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-16@example.com
-Message-ID: <588f1ebbcbf99_75b23ff6f243f9d011487@Aarons-iMac.local.mail>
+To: joe-13@example.com
+Message-ID: <58e78b5ce4bed_54863ff8c643f9c81947@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_588f1ebbcba8e_75b23ff6f243f9d011326";
+ boundary="--==_mimepart_58e78b5ce46df_54863ff8c643f9c818a1";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_588f1ebbcba8e_75b23ff6f243f9d011326
+----==_mimepart_58e78b5ce46df_54863ff8c643f9c818a1
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1315,57 +1224,56 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/admin/confirmation.455f934f-8e48-41ff-a603-290b8fe3d65f?confirmation_token=pxDUPyV8RJyxm7uePyxj )
+( http://localhost:3000/admin/confirmation.6b8180dc-9d97-4736-bedc-1784007abd11?confirmation_token=Zg4wwsFvHYiJpyTJzsRN )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_588f1ebbcba8e_75b23ff6f243f9d011326
+----==_mimepart_58e78b5ce46df_54863ff8c643f9c818a1
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>[PushType] Confirm your account</title>
 
-</head>
-
-<body bgcolor="#f6f6f6" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; height: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100% !important;"><style type="text/css">
-img {
+<style>img {
 max-width: 100%;
 }
 body {
 -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;
 }
-</style>
+</style></head>
+
+<body bgcolor="#f6f6f6" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0; padding: 0; font-size: 100%; line-height: 1.6; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;">
 
 <!-- body -->
-<table class="body-wrap" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 20px; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" bgcolor="#FFFFFF" style="border: 1px solid #f0f0f0; clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 20px;">
+<table class="body-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 20px;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" bgcolor="#FFFFFF" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 20px; border: 1px solid #f0f0f0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
 
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-      <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+      <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td class="logo" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #348eda; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 100%; margin: 0; padding: 0;" /></a></td>
         </tr>
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
 
-<table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.455f934f-8e48-41ff-a603-290b8fe3d65f?confirmation_token=pxDUPyV8RJyxm7uePyxj" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+<table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td class="padding" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
+      <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.6b8180dc-9d97-4736-bedc-1784007abd11?confirmation_token=Zg4wwsFvHYiJpyTJzsRN" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 10px 0 0; padding: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px; font-size: 100%; line-height: 2; color: #FFF; text-decoration: none; background-color: #348eda; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 25px;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -1378,23 +1286,23 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /body -->
 
 <!-- footer -->
-<table class="footer-wrap" style="clear: both !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" style="clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 0;">
+<table class="footer-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; padding: 0; margin: 0; clear: both !important;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
       
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-        <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-          <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <td align="center" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-              <p style="color: #666; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">PushType CMS: <a href="http://www.pushtype.org" style="color: #999; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+        <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+          <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <td align="center" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+              <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 12px; line-height: 1.6; color: #666; padding: 0; margin: 0 0 10px; font-weight: normal;">PushType CMS: <a href="http://www.pushtype.org" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #999; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
             </td>
           </tr>
         </table>
@@ -1402,7 +1310,7 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /footer -->
@@ -1410,74 +1318,40 @@ body {
 </body>
 </html>
 
-----==_mimepart_588f1ebbcba8e_75b23ff6f243f9d011326--
+----==_mimepart_58e78b5ce46df_54863ff8c643f9c818a1--
 
-Processing by PushType::ConfirmationsController#show as HTML
-  Parameters: {"confirmation_token"=>"pxDUPyV8RJyxm7uePyxj"}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "pxDUPyV8RJyxm7uePyxj"], ["LIMIT", 1]]
-  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.3ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (2.0ms)
-Completed 200 OK in 8ms (Views: 6.6ms | ActiveRecord: 0.2ms)
    (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
-----------------------------------------------------------------
-PushType::AuthenticatableTest::rememberable: test_0001_anonymous
-----------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
----------------------------------------------------------------------------
-PushType::AuthenticatableTest::database_athenticatable: test_0002_anonymous
----------------------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
----------------------------------------------------------------------------
-PushType::AuthenticatableTest::database_athenticatable: test_0001_anonymous
----------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
 ------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::PUT #update::with invalid user: test_0002_anonymous
+PushType::ConfirmationsControllerTest::PUT #update::with invalid user: test_0001_anonymous
 ------------------------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-17@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-17@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-17@example.com"], ["created_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["confirmation_token", "wT_spS1brBWRLhzcfS7q"], ["confirmation_sent_at", 2017-01-30 11:08:43 UTC]]
+  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-14@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-14@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-14@example.com"], ["created_at", 2017-04-07 12:51:40 UTC], ["updated_at", 2017-04-07 12:51:40 UTC], ["confirmation_token", "S5k2n7DUTSxrgu82FqEB"], ["confirmation_sent_at", 2017-04-07 12:51:40 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.4ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 2.9ms
-Sent mail to joe-17@example.com (4.0ms)
-Date: Mon, 30 Jan 2017 11:08:43 +0000
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 3.1ms
+Sent mail to joe-14@example.com (4.5ms)
+Date: Fri, 07 Apr 2017 13:51:40 +0100
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-17@example.com
-Message-ID: <588f1ebbdbc13_75b23ff6f243f9d0117dc@Aarons-iMac.local.mail>
+To: joe-14@example.com
+Message-ID: <58e78b5cf148f_54863ff8c643f9c822cf@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_588f1ebbdb6c9_75b23ff6f243f9d011654";
+ boundary="--==_mimepart_58e78b5cf0f08_54863ff8c643f9c8216c";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_588f1ebbdb6c9_75b23ff6f243f9d011654
+----==_mimepart_58e78b5cf0f08_54863ff8c643f9c8216c
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1493,57 +1367,56 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/admin/confirmation.38770a5f-d8dd-4229-8d1e-f3115b9b78f0?confirmation_token=wT_spS1brBWRLhzcfS7q )
+( http://localhost:3000/admin/confirmation.73b62a28-0a1c-41d4-8762-d2fae2aaad38?confirmation_token=S5k2n7DUTSxrgu82FqEB )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_588f1ebbdb6c9_75b23ff6f243f9d011654
+----==_mimepart_58e78b5cf0f08_54863ff8c643f9c8216c
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>[PushType] Confirm your account</title>
 
-</head>
-
-<body bgcolor="#f6f6f6" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; height: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100% !important;"><style type="text/css">
-img {
+<style>img {
 max-width: 100%;
 }
 body {
 -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;
 }
-</style>
+</style></head>
+
+<body bgcolor="#f6f6f6" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0; padding: 0; font-size: 100%; line-height: 1.6; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;">
 
 <!-- body -->
-<table class="body-wrap" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 20px; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" bgcolor="#FFFFFF" style="border: 1px solid #f0f0f0; clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 20px;">
+<table class="body-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 20px;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" bgcolor="#FFFFFF" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 20px; border: 1px solid #f0f0f0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
 
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-      <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+      <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td class="logo" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #348eda; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 100%; margin: 0; padding: 0;" /></a></td>
         </tr>
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
 
-<table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.38770a5f-d8dd-4229-8d1e-f3115b9b78f0?confirmation_token=wT_spS1brBWRLhzcfS7q" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+<table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td class="padding" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
+      <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.73b62a28-0a1c-41d4-8762-d2fae2aaad38?confirmation_token=S5k2n7DUTSxrgu82FqEB" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 10px 0 0; padding: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px; font-size: 100%; line-height: 2; color: #FFF; text-decoration: none; background-color: #348eda; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 25px;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -1556,23 +1429,23 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /body -->
 
 <!-- footer -->
-<table class="footer-wrap" style="clear: both !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" style="clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 0;">
+<table class="footer-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; padding: 0; margin: 0; clear: both !important;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
       
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-        <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-          <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <td align="center" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-              <p style="color: #666; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">PushType CMS: <a href="http://www.pushtype.org" style="color: #999; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+        <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+          <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <td align="center" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+              <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 12px; line-height: 1.6; color: #666; padding: 0; margin: 0 0 10px; font-weight: normal;">PushType CMS: <a href="http://www.pushtype.org" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #999; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
             </td>
           </tr>
         </table>
@@ -1580,7 +1453,7 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /footer -->
@@ -1588,48 +1461,48 @@ body {
 </body>
 </html>
 
-----==_mimepart_588f1ebbdb6c9_75b23ff6f243f9d011654--
+----==_mimepart_58e78b5cf0f08_54863ff8c643f9c8216c--
 
 Processing by PushType::ConfirmationsController#update as HTML
-  Parameters: {"user"=>{"confirmation_token"=>"wT_spS1brBWRLhzcfS7q", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "wT_spS1brBWRLhzcfS7q"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-17@example.com"], ["id", "38770a5f-d8dd-4229-8d1e-f3115b9b78f0"], ["LIMIT", 1]]
+  Parameters: {"user"=>{"confirmation_token"=>"S5k2n7DUTSxrgu82FqEB", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "S5k2n7DUTSxrgu82FqEB"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-14@example.com"], ["id", "73b62a28-0a1c-41d4-8762-d2fae2aaad38"], ["LIMIT", 1]]
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.3ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (2.1ms)
-Completed 200 OK in 10ms (Views: 7.2ms | ActiveRecord: 0.4ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (1.4ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (8.3ms)
+Completed 200 OK in 22ms (Views: 18.6ms | ActiveRecord: 0.4ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
 ------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::PUT #update::with invalid user: test_0003_anonymous
+PushType::ConfirmationsControllerTest::PUT #update::with invalid user: test_0002_anonymous
 ------------------------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  RELEASE SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-18@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-18@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-18@example.com"], ["created_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["confirmation_token", "rvPSGPZKkBNbryUmiF4i"], ["confirmation_sent_at", 2017-01-30 11:08:43 UTC]]
+  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-15@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-15@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-15@example.com"], ["created_at", 2017-04-07 12:51:41 UTC], ["updated_at", 2017-04-07 12:51:41 UTC], ["confirmation_token", "WNyGdYecTKg9qCYE1ebc"], ["confirmation_sent_at", 2017-04-07 12:51:41 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 3.3ms
-Sent mail to joe-18@example.com (4.0ms)
-Date: Mon, 30 Jan 2017 11:08:43 +0000
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.4ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 3.4ms
+Sent mail to joe-15@example.com (3.8ms)
+Date: Fri, 07 Apr 2017 13:51:41 +0100
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-18@example.com
-Message-ID: <588f1ebbeb65a_75b23ff6f243f9d0120c1@Aarons-iMac.local.mail>
+To: joe-15@example.com
+Message-ID: <58e78b5dea98_54863ff8c643f9c82510@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_588f1ebbeb120_75b23ff6f243f9d011992";
+ boundary="--==_mimepart_58e78b5de5c4_54863ff8c643f9c8241a";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_588f1ebbeb120_75b23ff6f243f9d011992
+----==_mimepart_58e78b5de5c4_54863ff8c643f9c8241a
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1645,57 +1518,56 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/admin/confirmation.72177d7c-84e9-4963-8070-dfb723d245a2?confirmation_token=rvPSGPZKkBNbryUmiF4i )
+( http://localhost:3000/admin/confirmation.ae5aa540-de1d-46a6-b210-a877d5f2b9b2?confirmation_token=WNyGdYecTKg9qCYE1ebc )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_588f1ebbeb120_75b23ff6f243f9d011992
+----==_mimepart_58e78b5de5c4_54863ff8c643f9c8241a
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>[PushType] Confirm your account</title>
 
-</head>
-
-<body bgcolor="#f6f6f6" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; height: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100% !important;"><style type="text/css">
-img {
+<style>img {
 max-width: 100%;
 }
 body {
 -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;
 }
-</style>
+</style></head>
+
+<body bgcolor="#f6f6f6" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0; padding: 0; font-size: 100%; line-height: 1.6; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;">
 
 <!-- body -->
-<table class="body-wrap" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 20px; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" bgcolor="#FFFFFF" style="border: 1px solid #f0f0f0; clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 20px;">
+<table class="body-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 20px;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" bgcolor="#FFFFFF" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 20px; border: 1px solid #f0f0f0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
 
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-      <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+      <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td class="logo" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #348eda; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 100%; margin: 0; padding: 0;" /></a></td>
         </tr>
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
 
-<table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.72177d7c-84e9-4963-8070-dfb723d245a2?confirmation_token=rvPSGPZKkBNbryUmiF4i" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+<table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td class="padding" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
+      <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.ae5aa540-de1d-46a6-b210-a877d5f2b9b2?confirmation_token=WNyGdYecTKg9qCYE1ebc" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 10px 0 0; padding: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px; font-size: 100%; line-height: 2; color: #FFF; text-decoration: none; background-color: #348eda; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 25px;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -1708,23 +1580,23 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /body -->
 
 <!-- footer -->
-<table class="footer-wrap" style="clear: both !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" style="clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 0;">
+<table class="footer-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; padding: 0; margin: 0; clear: both !important;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
       
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-        <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-          <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <td align="center" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-              <p style="color: #666; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">PushType CMS: <a href="http://www.pushtype.org" style="color: #999; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+        <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+          <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <td align="center" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+              <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 12px; line-height: 1.6; color: #666; padding: 0; margin: 0 0 10px; font-weight: normal;">PushType CMS: <a href="http://www.pushtype.org" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #999; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
             </td>
           </tr>
         </table>
@@ -1732,7 +1604,7 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /footer -->
@@ -1740,48 +1612,48 @@ body {
 </body>
 </html>
 
-----==_mimepart_588f1ebbeb120_75b23ff6f243f9d011992--
+----==_mimepart_58e78b5de5c4_54863ff8c643f9c8241a--
 
 Processing by PushType::ConfirmationsController#update as HTML
-  Parameters: {"user"=>{"confirmation_token"=>"rvPSGPZKkBNbryUmiF4i", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "rvPSGPZKkBNbryUmiF4i"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-18@example.com"], ["id", "72177d7c-84e9-4963-8070-dfb723d245a2"], ["LIMIT", 1]]
+  Parameters: {"user"=>{"confirmation_token"=>"WNyGdYecTKg9qCYE1ebc", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "WNyGdYecTKg9qCYE1ebc"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-15@example.com"], ["id", "ae5aa540-de1d-46a6-b210-a877d5f2b9b2"], ["LIMIT", 1]]
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.3ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (1.9ms)
-Completed 200 OK in 10ms (Views: 7.0ms | ActiveRecord: 0.4ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.5ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (2.9ms)
+Completed 200 OK in 11ms (Views: 7.6ms | ActiveRecord: 0.5ms)
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
 ------------------------------------------------------------------------------------------
-PushType::ConfirmationsControllerTest::PUT #update::with invalid user: test_0001_anonymous
+PushType::ConfirmationsControllerTest::PUT #update::with invalid user: test_0003_anonymous
 ------------------------------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
    (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-19@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-19@example.com"], ["LIMIT", 1]]
-  SQL (0.3ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-19@example.com"], ["created_at", 2017-01-30 11:08:43 UTC], ["updated_at", 2017-01-30 11:08:43 UTC], ["confirmation_token", "QysrcBnRbbJNvTwx2p3F"], ["confirmation_sent_at", 2017-01-30 11:08:43 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-16@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-16@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-16@example.com"], ["created_at", 2017-04-07 12:51:41 UTC], ["updated_at", 2017-04-07 12:51:41 UTC], ["confirmation_token", "zmzzfRwyySKVPP_kyinz"], ["confirmation_sent_at", 2017-04-07 12:51:41 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.4ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 3.2ms
-Sent mail to joe-19@example.com (4.0ms)
-Date: Mon, 30 Jan 2017 11:08:44 +0000
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 3.0ms
+Sent mail to joe-16@example.com (4.2ms)
+Date: Fri, 07 Apr 2017 13:51:41 +0100
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-19@example.com
-Message-ID: <588f1ebc58cd_75b23ff6f243f9d012312@Aarons-iMac.local.mail>
+To: joe-16@example.com
+Message-ID: <58e78b5d1ce65_54863ff8c643f9c82836@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_588f1ebc53c4_75b23ff6f243f9d01223c";
+ boundary="--==_mimepart_58e78b5d1c973_54863ff8c643f9c827f6";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_588f1ebc53c4_75b23ff6f243f9d01223c
+----==_mimepart_58e78b5d1c973_54863ff8c643f9c827f6
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1797,57 +1669,56 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/admin/confirmation.22523903-ca39-4a95-9111-c2cde67295c6?confirmation_token=QysrcBnRbbJNvTwx2p3F )
+( http://localhost:3000/admin/confirmation.371bd145-28a2-4d6a-944c-03fb594c2a00?confirmation_token=zmzzfRwyySKVPP_kyinz )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_588f1ebc53c4_75b23ff6f243f9d01223c
+----==_mimepart_58e78b5d1c973_54863ff8c643f9c827f6
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>[PushType] Confirm your account</title>
 
-</head>
-
-<body bgcolor="#f6f6f6" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; height: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100% !important;"><style type="text/css">
-img {
+<style>img {
 max-width: 100%;
 }
 body {
 -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;
 }
-</style>
+</style></head>
+
+<body bgcolor="#f6f6f6" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0; padding: 0; font-size: 100%; line-height: 1.6; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;">
 
 <!-- body -->
-<table class="body-wrap" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 20px; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" bgcolor="#FFFFFF" style="border: 1px solid #f0f0f0; clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 20px;">
+<table class="body-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 20px;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" bgcolor="#FFFFFF" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 20px; border: 1px solid #f0f0f0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
 
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-      <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+      <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td class="logo" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #348eda; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 100%; margin: 0; padding: 0;" /></a></td>
         </tr>
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
 
-<table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.22523903-ca39-4a95-9111-c2cde67295c6?confirmation_token=QysrcBnRbbJNvTwx2p3F" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+<table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td class="padding" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
+      <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.371bd145-28a2-4d6a-944c-03fb594c2a00?confirmation_token=zmzzfRwyySKVPP_kyinz" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 10px 0 0; padding: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px; font-size: 100%; line-height: 2; color: #FFF; text-decoration: none; background-color: #348eda; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 25px;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -1860,23 +1731,23 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /body -->
 
 <!-- footer -->
-<table class="footer-wrap" style="clear: both !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" style="clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 0;">
+<table class="footer-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; padding: 0; margin: 0; clear: both !important;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
       
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-        <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-          <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <td align="center" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-              <p style="color: #666; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">PushType CMS: <a href="http://www.pushtype.org" style="color: #999; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+        <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+          <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <td align="center" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+              <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 12px; line-height: 1.6; color: #666; padding: 0; margin: 0 0 10px; font-weight: normal;">PushType CMS: <a href="http://www.pushtype.org" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #999; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
             </td>
           </tr>
         </table>
@@ -1884,7 +1755,7 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /footer -->
@@ -1892,67 +1763,62 @@ body {
 </body>
 </html>
 
-----==_mimepart_588f1ebc53c4_75b23ff6f243f9d01223c--
+----==_mimepart_58e78b5d1c973_54863ff8c643f9c827f6--
 
 Processing by PushType::ConfirmationsController#update as HTML
-  Parameters: {"user"=>{"confirmation_token"=>"QysrcBnRbbJNvTwx2p3F", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "QysrcBnRbbJNvTwx2p3F"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-19@example.com"], ["id", "22523903-ca39-4a95-9111-c2cde67295c6"], ["LIMIT", 1]]
+  Parameters: {"user"=>{"confirmation_token"=>"zmzzfRwyySKVPP_kyinz", "password"=>"[FILTERED]", "password_confirmation"=>"[FILTERED]"}}
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "zmzzfRwyySKVPP_kyinz"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-16@example.com"], ["id", "371bd145-28a2-4d6a-944c-03fb594c2a00"], ["LIMIT", 1]]
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth
   Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.3ms)
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (1.7ms)
-Completed 200 OK in 9ms (Views: 6.4ms | ActiveRecord: 0.4ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/show.html.haml within layouts/push_type/auth (1.8ms)
+Completed 200 OK in 10ms (Views: 6.5ms | ActiveRecord: 0.4ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
--------------------------------------------------------------------------
-AuthenticatedControllerTest::unauthenticated request: test_0001_anonymous
--------------------------------------------------------------------------
+----------------------------------------------------
+PushType::InvitationMethodsTest: test_0001_anonymous
+----------------------------------------------------
    (0.0ms)  SAVEPOINT active_record_1
    (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
-Started GET "/admin/nodes" for 127.0.0.1 at 2017-01-30 11:08:44 +0000
-Processing by PushType::Admin::NodesController#index as HTML
-Redirected to http://www.example.com/admin/sign_in
-Filter chain halted as :authenticate_user! rendered or redirected
-Completed 302 Found in 1ms (ActiveRecord: 0.0ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
+   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.0ms)  ROLLBACK
+   (0.0ms)  BEGIN
 ----------------------------------------------------------------------
-PushType::Admin::UsersControllerTest::PUT #invite: test_0003_anonymous
+PushType::Admin::UsersControllerTest::PUT #invite: test_0002_anonymous
 ----------------------------------------------------------------------
-   (0.1ms)  SAVEPOINT active_record_1
-   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-20@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-20@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-20@example.com"], ["created_at", 2017-01-30 11:08:44 UTC], ["updated_at", 2017-01-30 11:08:44 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-01-30 11:08:44 UTC], ["confirmation_sent_at", 2017-01-30 11:08:44 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-17@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-17@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-17@example.com"], ["created_at", 2017-04-07 12:51:41 UTC], ["updated_at", 2017-04-07 12:51:41 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-04-07 12:51:41 UTC], ["confirmation_sent_at", 2017-04-07 12:51:41 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-21@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-21@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-21@example.com"], ["created_at", 2017-01-30 11:08:44 UTC], ["updated_at", 2017-01-30 11:08:44 UTC], ["confirmation_token", "xjF6pqdhZEP7JXkNpuPc"], ["confirmation_sent_at", 2017-01-30 11:08:44 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-18@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-18@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-18@example.com"], ["created_at", 2017-04-07 12:51:41 UTC], ["updated_at", 2017-04-07 12:51:41 UTC], ["confirmation_token", "DvZjF3uQmLevxs1dWVys"], ["confirmation_sent_at", 2017-04-07 12:51:41 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.8ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 38.2ms
-Sent mail to joe-21@example.com (3.9ms)
-Date: Mon, 30 Jan 2017 11:08:44 +0000
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.8ms
+Sent mail to joe-18@example.com (4.2ms)
+Date: Fri, 07 Apr 2017 13:51:41 +0100
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-21@example.com
-Message-ID: <588f1ebc1df98_75b23ff6f243f9d0126ba@Aarons-iMac.local.mail>
+To: joe-18@example.com
+Message-ID: <58e78b5d2d5e0_54863ff8c643f9c83143@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_588f1ebc1dad2_75b23ff6f243f9d01252b";
+ boundary="--==_mimepart_58e78b5d2d052_54863ff8c643f9c83044";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_588f1ebc1dad2_75b23ff6f243f9d01252b
+----==_mimepart_58e78b5d2d052_54863ff8c643f9c83044
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -1968,57 +1834,56 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/admin/confirmation.7942f440-3b77-4972-a93a-87ebdb53f08f?confirmation_token=xjF6pqdhZEP7JXkNpuPc )
+( http://localhost:3000/admin/confirmation.ed3aadeb-c3c6-4ed6-aba6-dada18350af9?confirmation_token=DvZjF3uQmLevxs1dWVys )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_588f1ebc1dad2_75b23ff6f243f9d01252b
+----==_mimepart_58e78b5d2d052_54863ff8c643f9c83044
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>[PushType] Confirm your account</title>
 
-</head>
-
-<body bgcolor="#f6f6f6" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; height: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100% !important;"><style type="text/css">
-img {
+<style>img {
 max-width: 100%;
 }
 body {
 -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;
 }
-</style>
+</style></head>
+
+<body bgcolor="#f6f6f6" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0; padding: 0; font-size: 100%; line-height: 1.6; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;">
 
 <!-- body -->
-<table class="body-wrap" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 20px; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" bgcolor="#FFFFFF" style="border: 1px solid #f0f0f0; clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 20px;">
+<table class="body-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 20px;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" bgcolor="#FFFFFF" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 20px; border: 1px solid #f0f0f0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
 
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-      <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+      <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td class="logo" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #348eda; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 100%; margin: 0; padding: 0;" /></a></td>
         </tr>
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
 
-<table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.7942f440-3b77-4972-a93a-87ebdb53f08f?confirmation_token=xjF6pqdhZEP7JXkNpuPc" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+<table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td class="padding" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
+      <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.ed3aadeb-c3c6-4ed6-aba6-dada18350af9?confirmation_token=DvZjF3uQmLevxs1dWVys" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 10px 0 0; padding: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px; font-size: 100%; line-height: 2; color: #FFF; text-decoration: none; background-color: #348eda; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 25px;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -2031,23 +1896,23 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /body -->
 
 <!-- footer -->
-<table class="footer-wrap" style="clear: both !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" style="clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 0;">
+<table class="footer-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; padding: 0; margin: 0; clear: both !important;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
       
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-        <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-          <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <td align="center" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-              <p style="color: #666; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">PushType CMS: <a href="http://www.pushtype.org" style="color: #999; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+        <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+          <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <td align="center" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+              <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 12px; line-height: 1.6; color: #666; padding: 0; margin: 0 0 10px; font-weight: normal;">PushType CMS: <a href="http://www.pushtype.org" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #999; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
             </td>
           </tr>
         </table>
@@ -2055,7 +1920,7 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /footer -->
@@ -2063,32 +1928,32 @@ body {
 </body>
 </html>
 
-----==_mimepart_588f1ebc1dad2_75b23ff6f243f9d01252b--
+----==_mimepart_58e78b5d2d052_54863ff8c643f9c83044--
 
 Processing by PushType::Admin::UsersController#invite as HTML
-  Parameters: {"id"=>"7942f440-3b77-4972-a93a-87ebdb53f08f"}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "453e45e5-a9d7-45fe-a179-afc0a8635599"], ["LIMIT", 1]]
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "7942f440-3b77-4972-a93a-87ebdb53f08f"], ["LIMIT", 1]]
+  Parameters: {"id"=>"ed3aadeb-c3c6-4ed6-aba6-dada18350af9"}
+  PushType::User Load (0.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "7376e245-1412-4432-bbaf-d4158d827b1c"], ["LIMIT", 1]]
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "ed3aadeb-c3c6-4ed6-aba6-dada18350af9"], ["LIMIT", 1]]
    (0.1ms)  SAVEPOINT active_record_2
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
   Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 3.0ms
-Sent mail to joe-21@example.com (3.8ms)
-Date: Mon, 30 Jan 2017 11:08:44 +0000
+Devise::Mailer#confirmation_instructions: processed outbound mail in 3.2ms
+Sent mail to joe-18@example.com (4.1ms)
+Date: Fri, 07 Apr 2017 13:51:41 +0100
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-21@example.com
-Message-ID: <588f1ebc29ed8_75b23ff6f243f9d0129e5@Aarons-iMac.local.mail>
+To: joe-18@example.com
+Message-ID: <58e78b5d39c57_54863ff8c643f9c834ee@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_588f1ebc299d2_75b23ff6f243f9d012897";
+ boundary="--==_mimepart_58e78b5d39758_54863ff8c643f9c833c7";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_588f1ebc299d2_75b23ff6f243f9d012897
+----==_mimepart_58e78b5d39758_54863ff8c643f9c833c7
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2104,57 +1969,56 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/admin/confirmation.7942f440-3b77-4972-a93a-87ebdb53f08f?confirmation_token=xjF6pqdhZEP7JXkNpuPc )
+( http://localhost:3000/admin/confirmation.ed3aadeb-c3c6-4ed6-aba6-dada18350af9?confirmation_token=DvZjF3uQmLevxs1dWVys )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_588f1ebc299d2_75b23ff6f243f9d012897
+----==_mimepart_58e78b5d39758_54863ff8c643f9c833c7
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>[PushType] Confirm your account</title>
 
-</head>
-
-<body bgcolor="#f6f6f6" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; height: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100% !important;"><style type="text/css">
-img {
+<style>img {
 max-width: 100%;
 }
 body {
 -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;
 }
-</style>
+</style></head>
+
+<body bgcolor="#f6f6f6" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0; padding: 0; font-size: 100%; line-height: 1.6; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;">
 
 <!-- body -->
-<table class="body-wrap" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 20px; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" bgcolor="#FFFFFF" style="border: 1px solid #f0f0f0; clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 20px;">
+<table class="body-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 20px;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" bgcolor="#FFFFFF" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 20px; border: 1px solid #f0f0f0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
 
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-      <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+      <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td class="logo" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #348eda; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 100%; margin: 0; padding: 0;" /></a></td>
         </tr>
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
 
-<table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.7942f440-3b77-4972-a93a-87ebdb53f08f?confirmation_token=xjF6pqdhZEP7JXkNpuPc" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+<table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td class="padding" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
+      <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.ed3aadeb-c3c6-4ed6-aba6-dada18350af9?confirmation_token=DvZjF3uQmLevxs1dWVys" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 10px 0 0; padding: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px; font-size: 100%; line-height: 2; color: #FFF; text-decoration: none; background-color: #348eda; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 25px;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -2167,23 +2031,23 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /body -->
 
 <!-- footer -->
-<table class="footer-wrap" style="clear: both !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" style="clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 0;">
+<table class="footer-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; padding: 0; margin: 0; clear: both !important;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
       
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-        <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-          <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <td align="center" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-              <p style="color: #666; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">PushType CMS: <a href="http://www.pushtype.org" style="color: #999; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+        <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+          <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <td align="center" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+              <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 12px; line-height: 1.6; color: #666; padding: 0; margin: 0 0 10px; font-weight: normal;">PushType CMS: <a href="http://www.pushtype.org" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #999; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
             </td>
           </tr>
         </table>
@@ -2191,7 +2055,7 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /footer -->
@@ -2199,47 +2063,47 @@ body {
 </body>
 </html>
 
-----==_mimepart_588f1ebc299d2_75b23ff6f243f9d012897--
+----==_mimepart_58e78b5d39758_54863ff8c643f9c833c7--
 
 Redirected to http://test.host/push_type/users
-Completed 302 Found in 48ms (ActiveRecord: 0.5ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+Completed 302 Found in 50ms (ActiveRecord: 0.6ms)
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
 ----------------------------------------------------------------------
 PushType::Admin::UsersControllerTest::PUT #invite: test_0001_anonymous
 ----------------------------------------------------------------------
    (0.1ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-22@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-22@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-22@example.com"], ["created_at", 2017-01-30 11:08:44 UTC], ["updated_at", 2017-01-30 11:08:44 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-01-30 11:08:44 UTC], ["confirmation_sent_at", 2017-01-30 11:08:44 UTC]]
+  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-19@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-19@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-19@example.com"], ["created_at", 2017-04-07 12:51:41 UTC], ["updated_at", 2017-04-07 12:51:41 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-04-07 12:51:41 UTC], ["confirmation_sent_at", 2017-04-07 12:51:41 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-23@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-23@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-23@example.com"], ["created_at", 2017-01-30 11:08:44 UTC], ["updated_at", 2017-01-30 11:08:44 UTC], ["confirmation_token", "aMrXizj1Uhepr9UdA1B9"], ["confirmation_sent_at", 2017-01-30 11:08:44 UTC]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-20@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-20@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-20@example.com"], ["created_at", 2017-04-07 12:51:41 UTC], ["updated_at", 2017-04-07 12:51:41 UTC], ["confirmation_token", "M59QCTfFHrfTKhm6NnrY"], ["confirmation_sent_at", 2017-04-07 12:51:41 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
   Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.4ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 3.0ms
-Sent mail to joe-23@example.com (3.9ms)
-Date: Mon, 30 Jan 2017 11:08:44 +0000
+Devise::Mailer#confirmation_instructions: processed outbound mail in 3.2ms
+Sent mail to joe-20@example.com (3.5ms)
+Date: Fri, 07 Apr 2017 13:51:41 +0100
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-23@example.com
-Message-ID: <588f1ebc36598_75b23ff6f243f9d01327@Aarons-iMac.local.mail>
+To: joe-20@example.com
+Message-ID: <58e78b5d48e20_54863ff8c643f9c83774@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_588f1ebc3613c_75b23ff6f243f9d01317";
+ boundary="--==_mimepart_58e78b5d489c3_54863ff8c643f9c83675";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_588f1ebc3613c_75b23ff6f243f9d01317
+----==_mimepart_58e78b5d489c3_54863ff8c643f9c83675
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2255,57 +2119,56 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/admin/confirmation.8d73adbd-9481-46a5-b254-f699af61d16e?confirmation_token=aMrXizj1Uhepr9UdA1B9 )
+( http://localhost:3000/admin/confirmation.6a2cb4fd-0a9d-40bd-894e-9969a254afdc?confirmation_token=M59QCTfFHrfTKhm6NnrY )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_588f1ebc3613c_75b23ff6f243f9d01317
+----==_mimepart_58e78b5d489c3_54863ff8c643f9c83675
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>[PushType] Confirm your account</title>
 
-</head>
-
-<body bgcolor="#f6f6f6" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; height: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100% !important;"><style type="text/css">
-img {
+<style>img {
 max-width: 100%;
 }
 body {
 -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;
 }
-</style>
+</style></head>
+
+<body bgcolor="#f6f6f6" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0; padding: 0; font-size: 100%; line-height: 1.6; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;">
 
 <!-- body -->
-<table class="body-wrap" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 20px; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" bgcolor="#FFFFFF" style="border: 1px solid #f0f0f0; clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 20px;">
+<table class="body-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 20px;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" bgcolor="#FFFFFF" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 20px; border: 1px solid #f0f0f0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
 
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-      <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+      <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td class="logo" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #348eda; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 100%; margin: 0; padding: 0;" /></a></td>
         </tr>
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
 
-<table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.8d73adbd-9481-46a5-b254-f699af61d16e?confirmation_token=aMrXizj1Uhepr9UdA1B9" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+<table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td class="padding" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
+      <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.6a2cb4fd-0a9d-40bd-894e-9969a254afdc?confirmation_token=M59QCTfFHrfTKhm6NnrY" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 10px 0 0; padding: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px; font-size: 100%; line-height: 2; color: #FFF; text-decoration: none; background-color: #348eda; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 25px;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -2318,23 +2181,23 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /body -->
 
 <!-- footer -->
-<table class="footer-wrap" style="clear: both !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" style="clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 0;">
+<table class="footer-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; padding: 0; margin: 0; clear: both !important;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
       
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-        <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-          <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <td align="center" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-              <p style="color: #666; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">PushType CMS: <a href="http://www.pushtype.org" style="color: #999; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+        <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+          <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <td align="center" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+              <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 12px; line-height: 1.6; color: #666; padding: 0; margin: 0 0 10px; font-weight: normal;">PushType CMS: <a href="http://www.pushtype.org" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #999; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
             </td>
           </tr>
         </table>
@@ -2342,7 +2205,7 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /footer -->
@@ -2350,32 +2213,32 @@ body {
 </body>
 </html>
 
-----==_mimepart_588f1ebc3613c_75b23ff6f243f9d01317--
+----==_mimepart_58e78b5d489c3_54863ff8c643f9c83675--
 
 Processing by PushType::Admin::UsersController#invite as HTML
-  Parameters: {"id"=>"8d73adbd-9481-46a5-b254-f699af61d16e"}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "6a0a454d-5c98-4bbe-a42e-e97de062688d"], ["LIMIT", 1]]
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "8d73adbd-9481-46a5-b254-f699af61d16e"], ["LIMIT", 1]]
+  Parameters: {"id"=>"6a2cb4fd-0a9d-40bd-894e-9969a254afdc"}
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "e5dd7609-8bba-4f65-9ab8-8c896b40a061"], ["LIMIT", 1]]
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "6a2cb4fd-0a9d-40bd-894e-9969a254afdc"], ["LIMIT", 1]]
    (0.1ms)  SAVEPOINT active_record_2
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
   Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 3.0ms
-Sent mail to joe-23@example.com (3.8ms)
-Date: Mon, 30 Jan 2017 11:08:44 +0000
+Devise::Mailer#confirmation_instructions: processed outbound mail in 2.9ms
+Sent mail to joe-20@example.com (6.4ms)
+Date: Fri, 07 Apr 2017 13:51:41 +0100
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-23@example.com
-Message-ID: <588f1ebc41a79_75b23ff6f243f9d0135cd@Aarons-iMac.local.mail>
+To: joe-20@example.com
+Message-ID: <58e78b5d53952_54863ff8c643f9c840c2@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_588f1ebc4160f_75b23ff6f243f9d0134b";
+ boundary="--==_mimepart_58e78b5d531f5_54863ff8c643f9c8392c";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_588f1ebc4160f_75b23ff6f243f9d0134b
+----==_mimepart_58e78b5d531f5_54863ff8c643f9c8392c
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2391,57 +2254,56 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/admin/confirmation.8d73adbd-9481-46a5-b254-f699af61d16e?confirmation_token=aMrXizj1Uhepr9UdA1B9 )
+( http://localhost:3000/admin/confirmation.6a2cb4fd-0a9d-40bd-894e-9969a254afdc?confirmation_token=M59QCTfFHrfTKhm6NnrY )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_588f1ebc4160f_75b23ff6f243f9d0134b
+----==_mimepart_58e78b5d531f5_54863ff8c643f9c8392c
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>[PushType] Confirm your account</title>
 
-</head>
-
-<body bgcolor="#f6f6f6" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; height: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100% !important;"><style type="text/css">
-img {
+<style>img {
 max-width: 100%;
 }
 body {
 -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;
 }
-</style>
+</style></head>
+
+<body bgcolor="#f6f6f6" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0; padding: 0; font-size: 100%; line-height: 1.6; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;">
 
 <!-- body -->
-<table class="body-wrap" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 20px; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" bgcolor="#FFFFFF" style="border: 1px solid #f0f0f0; clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 20px;">
+<table class="body-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 20px;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" bgcolor="#FFFFFF" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 20px; border: 1px solid #f0f0f0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
 
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-      <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+      <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td class="logo" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #348eda; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 100%; margin: 0; padding: 0;" /></a></td>
         </tr>
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
 
-<table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.8d73adbd-9481-46a5-b254-f699af61d16e?confirmation_token=aMrXizj1Uhepr9UdA1B9" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+<table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td class="padding" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
+      <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.6a2cb4fd-0a9d-40bd-894e-9969a254afdc?confirmation_token=M59QCTfFHrfTKhm6NnrY" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 10px 0 0; padding: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px; font-size: 100%; line-height: 2; color: #FFF; text-decoration: none; background-color: #348eda; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 25px;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -2454,23 +2316,23 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /body -->
 
 <!-- footer -->
-<table class="footer-wrap" style="clear: both !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" style="clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 0;">
+<table class="footer-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; padding: 0; margin: 0; clear: both !important;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
       
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-        <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-          <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <td align="center" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-              <p style="color: #666; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">PushType CMS: <a href="http://www.pushtype.org" style="color: #999; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+        <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+          <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <td align="center" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+              <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 12px; line-height: 1.6; color: #666; padding: 0; margin: 0 0 10px; font-weight: normal;">PushType CMS: <a href="http://www.pushtype.org" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #999; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
             </td>
           </tr>
         </table>
@@ -2478,7 +2340,7 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /footer -->
@@ -2486,47 +2348,47 @@ body {
 </body>
 </html>
 
-----==_mimepart_588f1ebc4160f_75b23ff6f243f9d0134b--
+----==_mimepart_58e78b5d531f5_54863ff8c643f9c8392c--
 
 Redirected to http://test.host/push_type/users
-Completed 302 Found in 46ms (ActiveRecord: 0.4ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+Completed 302 Found in 46ms (ActiveRecord: 0.5ms)
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
-   (0.1ms)  BEGIN
+   (0.2ms)  BEGIN
 ----------------------------------------------------------------------
-PushType::Admin::UsersControllerTest::PUT #invite: test_0002_anonymous
+PushType::Admin::UsersControllerTest::PUT #invite: test_0003_anonymous
 ----------------------------------------------------------------------
-   (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-24@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-24@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-24@example.com"], ["created_at", 2017-01-30 11:08:44 UTC], ["updated_at", 2017-01-30 11:08:44 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-01-30 11:08:44 UTC], ["confirmation_sent_at", 2017-01-30 11:08:44 UTC]]
+  PushType::User Exists (0.4ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-21@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-21@example.com"], ["LIMIT", 1]]
+  SQL (0.3ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-21@example.com"], ["created_at", 2017-04-07 12:51:41 UTC], ["updated_at", 2017-04-07 12:51:41 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-04-07 12:51:41 UTC], ["confirmation_sent_at", 2017-04-07 12:51:41 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
    (0.1ms)  SAVEPOINT active_record_2
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-25@example.com"], ["LIMIT", 1]]
-  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-25@example.com"], ["LIMIT", 1]]
-  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-25@example.com"], ["created_at", 2017-01-30 11:08:44 UTC], ["updated_at", 2017-01-30 11:08:44 UTC], ["confirmation_token", "ZQXjTgckzo696E9Z2bk4"], ["confirmation_sent_at", 2017-01-30 11:08:44 UTC]]
+  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-22@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-22@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-22@example.com"], ["created_at", 2017-04-07 12:51:41 UTC], ["updated_at", 2017-04-07 12:51:41 UTC], ["confirmation_token", "pwP2r-uRU73yM79VT8Bt"], ["confirmation_sent_at", 2017-04-07 12:51:41 UTC]]
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
   Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
 Devise::Mailer#confirmation_instructions: processed outbound mail in 2.9ms
-Sent mail to joe-25@example.com (3.6ms)
-Date: Mon, 30 Jan 2017 11:08:44 +0000
+Sent mail to joe-22@example.com (4.4ms)
+Date: Fri, 07 Apr 2017 13:51:41 +0100
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-25@example.com
-Message-ID: <588f1ebc4dc9c_75b23ff6f243f9d01389a@Aarons-iMac.local.mail>
+To: joe-22@example.com
+Message-ID: <58e78b5d62170_54863ff8c643f9c84328@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_588f1ebc4d824_75b23ff6f243f9d0137e9";
+ boundary="--==_mimepart_58e78b5d61c3e_54863ff8c643f9c842b1";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_588f1ebc4d824_75b23ff6f243f9d0137e9
+----==_mimepart_58e78b5d61c3e_54863ff8c643f9c842b1
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2542,57 +2404,56 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/admin/confirmation.b89c4238-075e-4471-8366-e22045921532?confirmation_token=ZQXjTgckzo696E9Z2bk4 )
+( http://localhost:3000/admin/confirmation.1582a352-9391-47c4-aa18-3634b3353b17?confirmation_token=pwP2r-uRU73yM79VT8Bt )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_588f1ebc4d824_75b23ff6f243f9d0137e9
+----==_mimepart_58e78b5d61c3e_54863ff8c643f9c842b1
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>[PushType] Confirm your account</title>
 
-</head>
-
-<body bgcolor="#f6f6f6" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; height: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100% !important;"><style type="text/css">
-img {
+<style>img {
 max-width: 100%;
 }
 body {
 -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;
 }
-</style>
+</style></head>
+
+<body bgcolor="#f6f6f6" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0; padding: 0; font-size: 100%; line-height: 1.6; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;">
 
 <!-- body -->
-<table class="body-wrap" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 20px; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" bgcolor="#FFFFFF" style="border: 1px solid #f0f0f0; clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 20px;">
+<table class="body-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 20px;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" bgcolor="#FFFFFF" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 20px; border: 1px solid #f0f0f0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
 
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-      <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+      <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td class="logo" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #348eda; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 100%; margin: 0; padding: 0;" /></a></td>
         </tr>
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
 
-<table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.b89c4238-075e-4471-8366-e22045921532?confirmation_token=ZQXjTgckzo696E9Z2bk4" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+<table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td class="padding" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
+      <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.1582a352-9391-47c4-aa18-3634b3353b17?confirmation_token=pwP2r-uRU73yM79VT8Bt" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 10px 0 0; padding: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px; font-size: 100%; line-height: 2; color: #FFF; text-decoration: none; background-color: #348eda; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 25px;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -2605,23 +2466,23 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /body -->
 
 <!-- footer -->
-<table class="footer-wrap" style="clear: both !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" style="clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 0;">
+<table class="footer-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; padding: 0; margin: 0; clear: both !important;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
       
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-        <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-          <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <td align="center" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-              <p style="color: #666; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">PushType CMS: <a href="http://www.pushtype.org" style="color: #999; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+        <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+          <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <td align="center" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+              <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 12px; line-height: 1.6; color: #666; padding: 0; margin: 0 0 10px; font-weight: normal;">PushType CMS: <a href="http://www.pushtype.org" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #999; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
             </td>
           </tr>
         </table>
@@ -2629,7 +2490,7 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /footer -->
@@ -2637,32 +2498,32 @@ body {
 </body>
 </html>
 
-----==_mimepart_588f1ebc4d824_75b23ff6f243f9d0137e9--
+----==_mimepart_58e78b5d61c3e_54863ff8c643f9c842b1--
 
 Processing by PushType::Admin::UsersController#invite as HTML
-  Parameters: {"id"=>"b89c4238-075e-4471-8366-e22045921532"}
-  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "31ee74c3-bd49-427e-babf-a501f679fd8c"], ["LIMIT", 1]]
-  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "b89c4238-075e-4471-8366-e22045921532"], ["LIMIT", 1]]
+  Parameters: {"id"=>"1582a352-9391-47c4-aa18-3634b3353b17"}
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "01e88f43-6f97-4057-b987-6e0c098c4a80"], ["LIMIT", 1]]
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "1582a352-9391-47c4-aa18-3634b3353b17"], ["LIMIT", 1]]
    (0.1ms)  SAVEPOINT active_record_2
    (0.1ms)  RELEASE SAVEPOINT active_record_2
   Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email
-  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.3ms)
-Devise::Mailer#confirmation_instructions: processed outbound mail in 2.5ms
-Sent mail to joe-25@example.com (3.5ms)
-Date: Mon, 30 Jan 2017 11:08:44 +0000
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/mailer/confirmation_instructions.html.erb within layouts/push_type/email (0.4ms)
+Devise::Mailer#confirmation_instructions: processed outbound mail in 3.4ms
+Sent mail to joe-22@example.com (4.4ms)
+Date: Fri, 07 Apr 2017 13:51:41 +0100
 From: pushtype@example.com
 Reply-To: pushtype@example.com
-To: joe-25@example.com
-Message-ID: <588f1ebc5806e_75b23ff6f243f9d014150@Aarons-iMac.local.mail>
+To: joe-22@example.com
+Message-ID: <58e78b5d6de84_54863ff8c643f9c84660@Aarons-iMac.local.mail>
 Subject: [PushType] Confirm your account
 Mime-Version: 1.0
 Content-Type: multipart/alternative;
- boundary="--==_mimepart_588f1ebc57c0c_75b23ff6f243f9d01409c";
+ boundary="--==_mimepart_58e78b5d6d987_54863ff8c643f9c845d8";
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 
-----==_mimepart_588f1ebc57c0c_75b23ff6f243f9d01409c
+----==_mimepart_58e78b5d6d987_54863ff8c643f9c845d8
 Content-Type: text/plain;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
@@ -2678,57 +2539,56 @@ To get started, confirm your account and set your own password by
 clicking the link below:
 
 Confirm my account 
-( http://localhost:3000/admin/confirmation.b89c4238-075e-4471-8366-e22045921532?confirmation_token=ZQXjTgckzo696E9Z2bk4 )
+( http://localhost:3000/admin/confirmation.1582a352-9391-47c4-aa18-3634b3353b17?confirmation_token=pwP2r-uRU73yM79VT8Bt )
 
 
 PushType CMS: www.pushtype.org ( http://www.pushtype.org ).
-----==_mimepart_588f1ebc57c0c_75b23ff6f243f9d01409c
+----==_mimepart_58e78b5d6d987_54863ff8c643f9c845d8
 Content-Type: text/html;
  charset=UTF-8
 Content-Transfer-Encoding: 7bit
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title>[PushType] Confirm your account</title>
 
-</head>
-
-<body bgcolor="#f6f6f6" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; height: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100% !important;"><style type="text/css">
-img {
+<style>img {
 max-width: 100%;
 }
 body {
 -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;
 }
-</style>
+</style></head>
+
+<body bgcolor="#f6f6f6" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0; padding: 0; font-size: 100%; line-height: 1.6; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%;">
 
 <!-- body -->
-<table class="body-wrap" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 20px; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" bgcolor="#FFFFFF" style="border: 1px solid #f0f0f0; clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 20px;">
+<table class="body-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 20px;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" bgcolor="#FFFFFF" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 20px; border: 1px solid #f0f0f0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
 
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-      <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td class="logo" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="color: #348eda; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; max-width: 100%; padding: 0;" /></a></td>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+      <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td class="logo" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0 20px;"><a href="http://localhost:3000/admin/" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #348eda; margin: 0; padding: 0;"><img alt="PushType" src="/assets/push_type/pushtype-logo-a3af31e6141c9b155900c4cfde696ee92b3c080d35cd5d7afc82f8fb5a2fe6fa.png" width="140" height="26" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 100%; margin: 0; padding: 0;" /></a></td>
         </tr>
-        <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-          <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
+        <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+          <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">Hello Joe Bloggs</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">You're receiving this email because a PushType account has been created for you.</p>
 
-<p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
+<p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;">To get started, confirm your account and set your own password by clicking the link below:</p>
 
-<table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td class="padding" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
-      <p style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.b89c4238-075e-4471-8366-e22045921532?confirmation_token=ZQXjTgckzo696E9Z2bk4" style="background: #348eda; border-color: #348eda; border-radius: 25px; border-style: solid; border-width: 10px 20px; color: #FFF; cursor: pointer; display: inline-block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; font-weight: bold; line-height: 2; margin: 0 10px 0 0; padding: 0; text-align: center; text-decoration: none;">Confirm my account</a></p>
+<table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td class="padding" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 10px 0;">
+      <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 14px; line-height: 1.6; font-weight: normal; margin: 0 0 10px; padding: 0;"><a class="btn-primary" href="http://localhost:3000/admin/confirmation.1582a352-9391-47c4-aa18-3634b3353b17?confirmation_token=pwP2r-uRU73yM79VT8Bt" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 10px 0 0; padding: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px; font-size: 100%; line-height: 2; color: #FFF; text-decoration: none; background-color: #348eda; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 25px;">Confirm my account</a></p>
     </td>
   </tr>
 </table>
@@ -2741,23 +2601,23 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /body -->
 
 <!-- footer -->
-<table class="footer-wrap" style="clear: both !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-  <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
-    <td class="container" style="clear: both !important; display: block !important; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px !important; padding: 0;">
+<table class="footer-wrap" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; padding: 0; margin: 0; clear: both !important;">
+  <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td class="container" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; margin: 0 auto; padding: 0; font-size: 100%; line-height: 1.6; display: block !important; max-width: 600px !important; clear: both !important;">
       
       <!-- content -->
-      <div class="content" style="display: block; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0 auto; max-width: 600px; padding: 0;">
-        <table style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0; width: 100%;">
-          <tr style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-            <td align="center" style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
-              <p style="color: #666; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 12px; font-weight: normal; line-height: 1.6; margin: 0 0 10px; padding: 0;">PushType CMS: <a href="http://www.pushtype.org" style="color: #999; font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
+      <div class="content" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; max-width: 600px; padding: 0; margin: 0 auto; display: block;">
+        <table style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; width: 100%; margin: 0; padding: 0;">
+          <tr style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+            <td align="center" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;">
+              <p style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 12px; line-height: 1.6; color: #666; padding: 0; margin: 0 0 10px; font-weight: normal;">PushType CMS: <a href="http://www.pushtype.org" style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; color: #999; margin: 0; padding: 0;">www.pushtype.org</a>.</p>
             </td>
           </tr>
         </table>
@@ -2765,7 +2625,7 @@ body {
       <!-- /content -->
       
     </td>
-    <td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
+    <td style="font-family: &quot;Helvetica Neue&quot;, &quot;Helvetica&quot;, Helvetica, Arial, sans-serif; font-size: 100%; line-height: 1.6; margin: 0; padding: 0;"></td>
   </tr>
 </table>
 <!-- /footer -->
@@ -2773,36 +2633,113 @@ body {
 </body>
 </html>
 
-----==_mimepart_588f1ebc57c0c_75b23ff6f243f9d01409c--
+----==_mimepart_58e78b5d6d987_54863ff8c643f9c845d8--
 
 Redirected to http://test.host/push_type/users
-Completed 302 Found in 42ms (ActiveRecord: 0.5ms)
-   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.2ms)  ROLLBACK
+Completed 302 Found in 48ms (ActiveRecord: 0.5ms)
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
----------------------------------------------------------------
-PushType::AuthenticatableTest::confirmable: test_0001_anonymous
----------------------------------------------------------------
+--------------------------------------------------------------------------------------------
+AuthenticatedApiControllerTest::authenticated with authorization header: test_0001_anonymous
+--------------------------------------------------------------------------------------------
    (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  RELEASE SAVEPOINT active_record_1
-   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.4ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-23@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.3ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-23@example.com"], ["LIMIT", 1]]
+  SQL (0.3ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-23@example.com"], ["created_at", 2017-04-07 12:51:41 UTC], ["updated_at", 2017-04-07 12:51:41 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-04-07 12:51:41 UTC], ["confirmation_sent_at", 2017-04-07 12:51:41 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Started GET "/api/nodes" for 127.0.0.1 at 2017-04-07 13:51:41 +0100
+Processing by PushType::Api::NodesController#index as JSON
+  PushType::User Load (0.3ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "d54bb6bf-fadd-49ca-a5cb-a694fd733551"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/api/app/views/push_type/api/nodes/index.json.jbuilder
+  PushType::Node Load (0.5ms)  SELECT  "push_type_nodes".* FROM "push_type_nodes" WHERE "push_type_nodes"."parent_id" IS NULL AND "push_type_nodes"."deleted_at" IS NULL ORDER BY sort_order LIMIT $1 OFFSET $2  [["LIMIT", 30], ["OFFSET", 0]]
+  Rendered collection of /Users/aaron/dev/pushcode/push_type/api/app/views/push_type/api/shared/_pagination.json.jbuilder [0 times] (0.0ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/api/app/views/push_type/api/nodes/index.json.jbuilder (6.1ms)
+Completed 200 OK in 59ms (Views: 47.2ms | ActiveRecord: 0.8ms)
+   (0.2ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+------------------------------------------------------------------------------------------------------
+PushType::ConfirmationsControllerTest::GET #show::with invalid confirmation token: test_0001_anonymous
+------------------------------------------------------------------------------------------------------
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+Processing by PushType::ConfirmationsController#show as HTML
+  Parameters: {"confirmation_token"=>"invalid"}
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "invalid"], ["LIMIT", 1]]
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "invalid"], ["LIMIT", 1]]
+  PushType::User Load (0.2ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "56dd2b640f90e3a4e5683afcc5dd5f0e570245a58d518de1036b077bedaf3025"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/new.html.haml within layouts/push_type/auth
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (1.0ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/new.html.haml within layouts/push_type/auth (6.4ms)
+Completed 200 OK in 236ms (Views: 18.5ms | ActiveRecord: 0.6ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
---------------------------------------------------------
-PushType::AuthenticationMethodsTest: test_0001_anonymous
---------------------------------------------------------
+------------------------------------------------------------------------------------------------------
+PushType::ConfirmationsControllerTest::GET #show::with invalid confirmation token: test_0002_anonymous
+------------------------------------------------------------------------------------------------------
    (0.1ms)  SAVEPOINT active_record_1
    (0.1ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK TO SAVEPOINT active_record_1
-   (0.0ms)  ROLLBACK
+Processing by PushType::ConfirmationsController#show as HTML
+  Parameters: {"confirmation_token"=>"invalid"}
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "invalid"], ["LIMIT", 1]]
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "invalid"], ["LIMIT", 1]]
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."confirmation_token" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["confirmation_token", "56dd2b640f90e3a4e5683afcc5dd5f0e570245a58d518de1036b077bedaf3025"], ["LIMIT", 1]]
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/new.html.haml within layouts/push_type/auth
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/devise/shared/_links.html.erb (0.4ms)
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/confirmations/new.html.haml within layouts/push_type/auth (1.7ms)
+Completed 200 OK in 11ms (Views: 8.0ms | ActiveRecord: 0.3ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
    (0.1ms)  BEGIN
---------------------------------------------------------
-PushType::AuthenticationMethodsTest: test_0002_anonymous
---------------------------------------------------------
+--------------------------------------------------------------------------------------------
+PushType::Admin::ProfilesControllerTest::PUT #update::with invalid user: test_0001_anonymous
+--------------------------------------------------------------------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-24@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.1ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-24@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-24@example.com"], ["created_at", 2017-04-07 12:51:41 UTC], ["updated_at", 2017-04-07 12:51:41 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-04-07 12:51:41 UTC], ["confirmation_sent_at", 2017-04-07 12:51:41 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::Admin::ProfilesController#update as HTML
+  Parameters: {"user"=>{"name"=>""}}
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "4d5f407f-a1bb-404f-b15e-e52c620838aa"], ["LIMIT", 1]]
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-24@example.com"], ["id", "4d5f407f-a1bb-404f-b15e-e52c620838aa"], ["LIMIT", 1]]
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_2
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin (7.1ms)
+Completed 200 OK in 26ms (Views: 22.5ms | ActiveRecord: 0.5ms)
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+--------------------------------------------------------------------------------------------
+PushType::Admin::ProfilesControllerTest::PUT #update::with invalid user: test_0002_anonymous
+--------------------------------------------------------------------------------------------
    (0.0ms)  SAVEPOINT active_record_1
    (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.0ms)  SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-25@example.com"], ["LIMIT", 1]]
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 LIMIT $2  [["email", "joe-25@example.com"], ["LIMIT", 1]]
+  SQL (0.2ms)  INSERT INTO "push_type_users" ("name", "email", "created_at", "updated_at", "confirmation_token", "confirmed_at", "confirmation_sent_at") VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING "id"  [["name", "Joe Bloggs"], ["email", "joe-25@example.com"], ["created_at", 2017-04-07 12:51:41 UTC], ["updated_at", 2017-04-07 12:51:41 UTC], ["confirmation_token", "Generated account"], ["confirmed_at", 2017-04-07 12:51:41 UTC], ["confirmation_sent_at", 2017-04-07 12:51:41 UTC]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_2
+Processing by PushType::Admin::ProfilesController#update as HTML
+  Parameters: {"user"=>{"name"=>""}}
+  PushType::User Load (0.1ms)  SELECT  "push_type_users".* FROM "push_type_users" WHERE "push_type_users"."id" = $1 ORDER BY "push_type_users"."name" ASC LIMIT $2  [["id", "fdf40f9b-39d0-429a-9113-b92098de2c8b"], ["LIMIT", 1]]
+   (0.1ms)  SAVEPOINT active_record_2
+  PushType::User Exists (0.2ms)  SELECT  1 AS one FROM "push_type_users" WHERE "push_type_users"."email" = $1 AND ("push_type_users"."id" != $2) LIMIT $3  [["email", "joe-25@example.com"], ["id", "fdf40f9b-39d0-429a-9113-b92098de2c8b"], ["LIMIT", 1]]
+   (0.1ms)  ROLLBACK TO SAVEPOINT active_record_2
+  Rendering /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin
+  Rendered /Users/aaron/dev/pushcode/push_type/auth/app/views/push_type/admin/profiles/edit.html.haml within layouts/push_type/admin (2.1ms)
+Completed 200 OK in 12ms (Views: 8.4ms | ActiveRecord: 0.4ms)
    (0.1ms)  ROLLBACK TO SAVEPOINT active_record_1
    (0.1ms)  ROLLBACK