Merge branch 'more-updates' into 'master'

Removed Completed Proposals from ffs.yml for easier merging

See merge request monero-project/forum-funding-system!2

_data/completed-proposals.yml

+- stage: Completed Proposals
+  proposals:
+    - name: Documentation and cleanup of source code 
+      url: /forum-funding-system/proposals/documentation-cleanup.html
+      author: tewinget
+    - name: What is Monero? is produced and open-sourced
+      url: /forum-funding-system/proposals/whatismonero-produced.html
+      author: savandra
+    - name: Improving Developer Guides to include Simplewallet examples and Bitmonerod methods and examples
+      url: /forum-funding-system/proposals/improve-devguides-simplewallet.html
+      author: bigredmachine
+    - name: A continuation for all purpose programming of what needs to get done in monero
+      url: /forum-funding-system/proposals/mooo-continuation-programming.html
+      author: moneromooo
+    - name: Create End-User Kovri documentation
+      url: /forum-funding-system/proposals/kovri-end-user-docs.html
+      author: anonimal
+    - name: fluffypony's Conference Circuit Jan 2017 Edition
+      url: /forum-funding-system/proposals/fp-conference-2017.html
+      author: fluffypony
+    - name: The official Qt GUI Project
+      url: /forum-funding-system/proposals/official-qt-gui.html
+      author: othe
+    - name: Justin's Local Meetup Talks Proposal 1
+      url: /forum-funding-system/proposals/justin-local-meetups-1.html
+      author: samsunggalaxyplayer
+    - name: Justin's Local Meetup Talks Proposal 2
+      url: /forum-funding-system/proposals/justin-local-meetups-2.html
+      author: samsunggalaxyplayer
+    - name: More mooo coding goodness
+      url: /forum-funding-system/proposals/more-mooo-coding-goodness.html
+      author: moneromooo
+    - name: Funding for a Monero subforum on the largest chinese BTC forum 8BTC
+      url: /forum-funding-system/proposals/monero-subforum-8btc.html
+      author: firperfect
+    - name: Additional GUI Developer
+      url: /forum-funding-system/proposals/additional-gui-dev.html
+      author: Jaquee
+    - name: Release of new/updated pool software
+      url: /forum-funding-system/proposals/release-pool-software.html
+      author: Snipa22
+    - name: Monero integrations with web apps
+      url: /forum-funding-system/proposals/monero-integrations.html
+      author: serhack
\ No newline at end of file

_data/ffs.yml

@@ -36,50 +36,4 @@
   proposals:
     - name: Getmonero.org Redesign
       url: /forum-funding-system/proposals/getmonero-redesign.html
-      author: rehrar
-    
-    
-- stage: Completed Proposals
-  proposals:
-    - name: Documentation and cleanup of source code 
-      url: /forum-funding-system/proposals/documentation-cleanup.html
-      author: tewinget
-    - name: What is Monero? is produced and open-sourced
-      url: /forum-funding-system/proposals/whatismonero-produced.html
-      author: savandra
-    - name: Improving Developer Guides to include Simplewallet examples and Bitmonerod methods and examples
-      url: /forum-funding-system/proposals/improve-devguides-simplewallet.html
-      author: bigredmachine
-    - name: A continuation for all purpose programming of what needs to get done in monero
-      url: /forum-funding-system/proposals/mooo-continuation-programming.html
-      author: moneromooo
-    - name: Create End-User Kovri documentation
-      url: /forum-funding-system/proposals/kovri-end-user-docs.html
-      author: anonimal
-    - name: fluffypony's Conference Circuit Jan 2017 Edition
-      url: /forum-funding-system/proposals/fp-conference-2017.html
-      author: fluffypony
-    - name: The official Qt GUI Project
-      url: /forum-funding-system/proposals/official-qt-gui.html
-      author: othe
-    - name: Justin's Local Meetup Talks Proposal 1
-      url: /forum-funding-system/proposals/justin-local-meetups-1.html
-      author: samsunggalaxyplayer
-    - name: Justin's Local Meetup Talks Proposal 2
-      url: /forum-funding-system/proposals/justin-local-meetups-2.html
-      author: samsunggalaxyplayer
-    - name: More mooo coding goodness
-      url: /forum-funding-system/proposals/more-mooo-coding-goodness.html
-      author: moneromooo
-    - name: Funding for a Monero subforum on the largest chinese BTC forum 8BTC
-      url: /forum-funding-system/proposals/monero-subforum-8btc.html
-      author: firperfect
-    - name: Additional GUI Developer
-      url: /forum-funding-system/proposals/additional-gui-dev.html
-      author: Jaquee
-    - name: Release of new/updated pool software
-      url: /forum-funding-system/proposals/release-pool-software.html
-      author: Snipa22
-    - name: Monero integrations with web apps
-      url: /forum-funding-system/proposals/monero-integrations.html
-      author: serhack
+      author: rehrar
\ No newline at end of file