Non-interactive AWS install by running a single script.

Merge branch 'master' into non-interactive-aws-install

Conflicts:
	doc/installation.md

Fix merge mess in installation.md

app/views/keys/_form.html.haml

@@ -11,8 +11,14 @@
       .input= f.text_field :title
     .clearfix
       = f.label :key
-      .input= f.text_area :key, class: [:xxlarge, :thin_area]
-    .actions
-      = f.submit 'Save', class: "primary btn"
-      = link_to "Cancel", keys_path, class: "btn"
+      .input
+        = f.text_area :key, class: [:xxlarge, :thin_area]
+        %p.hint
+          Paste your public key here. Read more about how generate it
+          = link_to "here", help_ssh_path
+
+
+    .actions
+      = f.submit 'Save', class: "btn save-btn"
+      = link_to "Cancel", keys_path, class: "btn cancel-btn"
 

app/views/keys/index.html.haml

@@ -1,6 +1,6 @@
 %h3.page_title
   SSH Keys
-  = link_to "Add new", new_key_path, class: "btn small right"
+  = link_to "Add new", new_key_path, class: "btn right"
 
 %hr
 %p.slead 

app/views/keys/new.html.haml

@@ -1,4 +1,4 @@
-%h3.page_title New key
+%h3.page_title Add an SSH Key
 %hr
 = render 'form'