merges Vulcan-Starter

Author: lewi-g

.gitignore

@@ -19,6 +19,7 @@ deploy.sh
 dump/
 dump/*
 
+production.settings.json
 settings.json
 settings.json.not-used
 .idea
@@ -48,5 +49,3 @@ packages/nova-router/.npm
 npm-debug.log
 
 .meteor/.id
-
-token.json

.meteor/.finished-upgraders

@@ -0,0 +1,18 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
+notices-for-facebook-graph-api-2
+1.2.0-standard-minifiers-package
+1.2.0-meteor-platform-split
+1.2.0-cordova-changes
+1.2.0-breaking-changes
+1.3.0-split-minifiers-package
+1.4.0-remove-old-dev-bundle-link
+1.4.1-add-shell-server-package
+1.4.3-split-account-service-packages
+1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base

.meteor/packages

@@ -1,15 +1,28 @@
 # see http://docs.vulcanjs.org/packages
 
-vulcan:core@1.8.9
+vulcan:core
 
 ############ Language Packages ############
 
 vulcan:i18n-en-us
 
 ############ Accounts Packages ############
 
-accounts-github
+accounts-password@1.5.1
+# accounts-twitter
+# accounts-facebook
 
 ############ Your Packages ############
 
-news
+getting-started
+
+# example-simple
+# example-movies
+# example-instagram
+# example-forum
+# example-customization
+# example-permissions
+# example-membership
+# example-interfaces
+# example-reactions
+# example-forms

.meteor/release

@@ -1 +1 @@
-METEOR@1.6.1
+METEOR@1.7.0.1