Squashed commit of the following:

commit 43023b8b4b719ebf7fa93be28e5b485cb1fbe47e
Merge: 076ef8e 7801a45
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed May 7 21:34:02 2014 -0700

    Merge branch 'master' of github.com:cdrake757/drakefm

    Conflicts:
    	ohm.coffee
    	ohm.js
    	server/ghost/content/data/ghost-dev.db

commit 076ef8ec4b77bdfa45b557323b71f11e6628e8c3
Merge: aba9fad a398c3f
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed May 7 21:26:20 2014 -0700

    Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	.gitmodules
    	gruntfile.coffee
    	package.json
    	server/controllers/SampleController.js

commit 7801a456f6279072bf43ad816c5e23e968282dcf
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue May 6 01:49:33 2014 -0700

    updated bs

commit b82f270347015ce0afe36eb549f8e0f7998e374e
Merge: c7dee80 d1ffa36
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue May 6 01:46:34 2014 -0700

    Merge branch 'weiss'

    Conflicts:
    	client/js/parallax.js
    	client/sass/weiss.sass
    	images/logo.png
    	server/ghost/config.js
    	server/ghost/content/images/2014/Apr/cover.png
    	server/ghost/content/images/2014/Apr/logo.png
    	server/ghost/content/themes/weiss-theme/CHANGELOG.md
    	server/ghost/content/themes/weiss-theme/CONTRIBUTING.md
    	server/ghost/content/themes/weiss-theme/LICENSE
    	server/ghost/content/themes/weiss-theme/README.md
    	server/ghost/content/themes/weiss-theme/assets/css/screen.css
    	server/ghost/content/themes/weiss-theme/assets/img/favicon.ico
    	server/ghost/content/themes/weiss-theme/assets/img/weiss-favicon.png
    	server/ghost/content/themes/weiss-theme/assets/img/weiss.png
    	server/ghost/content/themes/weiss-theme/assets/js/app.js
    	server/ghost/content/themes/weiss-theme/assets/js/fittext.js
    	server/ghost/content/themes/weiss-theme/assets/js/respond.min.js
    	server/ghost/content/themes/weiss-theme/default.hbs
    	server/ghost/content/themes/weiss-theme/index.hbs
    	server/ghost/content/themes/weiss-theme/post.hbs
    	server/ghost/content/themes/weiss-theme/rollsroyce-2.png
    	server/views/weiss.jade
    	weiss.coffee
    	weiss.js

commit d1ffa36e7b84cd813eb16eb8e9bbc12570974e48
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue May 6 01:14:31 2014 -0700

    hotfix

commit b5561ca9d78288b6733d0182e659ca7268a81373
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue May 6 01:02:30 2014 -0700

    updated ghost location

commit 6ee90b2272a35af3c7291fe184fca3a4128d47d9
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue May 6 00:53:30 2014 -0700

     updated env

commit 9b9378c667a0c778d67ec679c2d0a2fc0bbaf9f9
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue May 6 00:34:45 2014 -0700

    update links

commit 4afa7a544ae79f2881228b334d60f83c8a4cb71f
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue May 6 00:26:15 2014 -0700

    update links

commit 327123b2da719754b1a478fde65ec8142b6fb301
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue May 6 00:07:52 2014 -0700

    added links

commit 7bd0e80b8f89dbc0b35f865261c96f84bb7bd629
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon May 5 23:37:39 2014 -0700

    moved to main static dir

commit 426dcdbf23e41d1f1c6d7281199cf1a269d111dc
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon May 5 23:27:42 2014 -0700

    adding pdf forms

commit 33f7a82343131d8bbdf7719c9007a9d03726a414
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon May 5 22:48:57 2014 -0700

    updated links

commit 5c2546e5ebb65b692cd770c9d3b5f2fb21d3431e
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon May 5 22:46:50 2014 -0700

    ghost config

commit 511f53d8be070447fea2ac3636d3d6b3759a803c
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon May 5 22:42:01 2014 -0700

    fixing ghost config

commit 7a7bdc2cef9fa5345f5e32513d642883b8fd2927
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon May 5 22:39:50 2014 -0700

    fixing ghost config

commit 50e795a09d23670f8f545b9c30088a453508fb8a
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon May 5 22:31:27 2014 -0700

    ghost config

commit 93aef87420476e37fb016ed34438356c70641711
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon May 5 22:28:18 2014 -0700

    ghost config

commit 899d315d2471cfba5929e098ab38058bccd015ac
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon May 5 22:26:23 2014 -0700

    config updates

commit 10abb37807622cdf8914547c2416f2b8097d2df7
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon May 5 21:46:05 2014 -0700

    removing 404 to test

commit 68a6e1196fdf5fab7a91123427aac5c608833d42
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon May 5 21:13:41 2014 -0700

    showing more content

commit ee571f6df24f55c9624062b4e79943548172c31c
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon May 5 15:57:32 2014 -0700

    updated menu

commit 68e0a75b29fb6f835d2e3f6c9f3a1070ee9b7f29
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon May 5 12:18:35 2014 -0700

    fixed skrollr on mobile

commit c7dee80da1385cda12227cff7ad8c47fe2d7c2ec
Author: Cameron Drake <cameron@drake.fm>
Date:   Sat May 3 14:49:01 2014 -0700

    up

commit aba9fadb569bb6f0192130a8ddbf556ddcc63e11
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri May 2 20:14:33 2014 -0700

    Ghost as CMS

commit a1833900b95c1d4f9c4de602f7cf80ff5e6ae97d
Merge: 058274e 3281dd1
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri May 2 19:37:16 2014 -0700

    Merge branch 'weiss'

    Conflicts:
    	.gitmodules
    	ghost
    	gruntfile.coffee

commit 3281dd19256a9f8888b5a27404c41d1f312c4d8f
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri May 2 17:45:54 2014 -0700

    updated the layout added favicon

commit a27c818b18c32c6241dbfad306bc41292d23bdb8
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri May 2 15:39:31 2014 -0700

    ghost is successful

commit 64935db8a19b51960e320a1d49fe1e717fd091c7
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri May 2 14:58:46 2014 -0700

    updated ghost

commit 442f192171f4fdc1030910bc0e4155e25c61568b
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri May 2 14:04:32 2014 -0700

    npm can\'t handle ghost prod using files

commit 95422df065d232aac367922e764be3a1c150993b
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri May 2 13:42:26 2014 -0700

    added ghost as dir

commit f59e926c4cbde02a516f81581f83ebf2109d227f
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri May 2 04:18:44 2014 -0700

    fixed css ignore issue

commit d39afbfe416febca07ad6065c4cb242f16932490
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri May 2 03:31:21 2014 -0700

    casper

commit b80d0c2a2789a6cda5dea7e7838aaa54b7826d31
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu May 1 23:16:37 2014 -0700

    removed production database

commit a0027fcb7ecf48888756a00c21350c2b52ab092c
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu May 1 23:12:39 2014 -0700

    added theme

commit b11a012eae847a4a701ec9ac0f9d4bcd41862db4
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu May 1 23:07:51 2014 -0700

    update

commit 058274e296027293ed7822d041185e4205ec1f57
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu May 1 22:48:00 2014 -0700

    Conflicts:
    	.gitmodules
    	gruntfile.coffee

commit ebedae12fd131ee127dbab7205a275eaa9d2b7f0
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu May 1 22:15:05 2014 -0700

    ghost as npm module

commit a1782de57468f22ce14880e8a152c69ef09562fa
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu May 1 21:51:23 2014 -0700

    removed submodule

commit 0983100afcc83646831f658f137059e0b71225a2
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu May 1 20:09:57 2014 -0700

    up

    update

    update

    update

    update

    update

commit 6e64217ee1f2754f2ea5694e39b34e330e7d7edc
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu May 1 19:55:18 2014 -0700

    adding ghost as submodule

commit d06ce3126ead5bd58186b7ead7dfa8634a6b43e2
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu May 1 19:38:28 2014 -0700

    remove

commit da8659b506a782ef0c269cbc5aca546061b0c9c2
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu May 1 19:37:51 2014 -0700

    added theme

commit 006baf44254fac3f0610ce1c3d95abd523f4c689
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu May 1 19:09:30 2014 -0700

    added ghost

commit 996eb791cb0ef7e2138af68f968ebc5e352d4b88
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu May 1 19:07:07 2014 -0700

    Squashed commit of the following:

    commit 06baa8cf4151c1a608e36fa1b3eb6ccba13ca1a3
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu May 1 18:59:22 2014 -0700

        rm

    commit 7ab2124b3b8125b307ce954a1e00365d9860ab82
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu May 1 18:58:45 2014 -0700

        updated gruntfile

    commit e92ef533c80674e3ce6fd1f14c756c6f381040d8
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu May 1 18:58:09 2014 -0700

        adding ghost as submodule

    commit b3eeea9a2868b714fd6fd14289c1f9c59afba6cd
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Wed Apr 30 21:35:12 2014 -0700

        updated images

    commit 018b96c6a49d9184d9c5abe10279c8b15a85cfd5
    Merge: 0b469bf 90bc39a
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Wed Apr 30 20:11:09 2014 -0700

        Merge branch 'master' into weiss

    commit 0b469bfeb5b712bc1a67674720a540d300dc5511
    Merge: fc4f422 d3a60c4
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Wed Apr 30 15:13:57 2014 -0700

        Merge branch 'master' into weiss

        Conflicts:
        	server/config/config.js

    commit fc4f422704833978bc487e1550eabe3afee4b6bd
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Wed Apr 30 15:12:34 2014 -0700

        merge to master
        Conflicts:
        	server/config/config.js

    commit 6a1bb36092a20a428028f47fb284f996dd683cd2
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Tue Apr 29 02:12:49 2014 -0700

        adding touch icon

    commit 9472864dbe5c053281a3154bc4000adf5fb158b8
    Merge: 1457f05 9fa8c6f
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Tue Apr 29 01:49:58 2014 -0700

        Merge branch 'master' into weiss

    commit 1457f054e483e8cb65ca063fed9a9b8d6a2bc22c
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Tue Apr 29 01:42:20 2014 -0700

        updates

    commit 20d41e262ae90fa88c79446664f90a496516aaf7
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 28 23:49:58 2014 -0700

        rename

    commit 7c32aa3a231321ceb767ac361cc051530862c02b
    Merge: 82b8b60 38935f5
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 28 22:41:00 2014 -0700

        Merge branch 'master' into weiss

        Conflicts:
        	server/views/includes/scripts.jade

    commit 82b8b602e9c160d7daee6aabef242d3cccff60d0
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 28 21:05:56 2014 -0700

        updates

    commit 112836f6ce09d0df57b410635587f972fecde584
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 28 20:53:52 2014 -0700

        link color

    commit e1c44bbe5a62abf1ce93dbb114af78fa83022adc
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 28 20:52:18 2014 -0700

        structure

    commit baa49d4daeac5687e2c27fab3d3daad1be272284
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 28 20:43:44 2014 -0700

        updated map

    commit 8ef526c10fdaea284f26a10fb1d6ff499ee0e02b
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Fri Apr 25 21:07:35 2014 -0700

        removed submodule

    commit a766e0f96639d728dcf55eeda3d6908a71c0770d
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Fri Apr 25 20:59:35 2014 -0700

        updated layout

    commit daf475b86a42556e4e2d4effd654db403a3a696e
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Fri Apr 25 20:21:36 2014 -0700

        no submodule

    commit 864df1ed5865f345dd279d82bf058fe23458dfef
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Fri Apr 25 19:52:31 2014 -0700

        test

        test

        test

        test

        test

        test

    commit b33703db44f1f861e6b03ab2d8f1a28596ee6cdf
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Fri Apr 25 19:39:31 2014 -0700

        adding ghost data

    commit 93239d4a0f6b4bc1cefa9b3978b6dcec22bb012c
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Fri Apr 25 15:49:11 2014 -0700

        fix links

    commit ae889dc3676ac72099f4233ffb189971847d5e65
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Fri Apr 25 15:31:50 2014 -0700

        added blog links

    commit 4f93bcba5a4c683f588f222937bf77404c999158
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 22:28:26 2014 -0700

        fix scripts

    commit fb2f4d8cd842dbb41a188d8627e7c1c0d2d3e560
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 20:29:16 2014 -0700

        test 2

    commit ed0075c06b7ce6e9705033333826257f9aefa2f5
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 20:27:03 2014 -0700

        test

    commit e6c6cfa27163d38270a3a2fee791a9b99f274fb0
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 19:54:10 2014 -0700

        test

    commit c045e24d81bef9a77bfd00f9bf448fb2b1abbc13
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 18:33:10 2014 -0700

        disable io for now

    commit d59241cd934d8b6ffc24c87c364d49f4b07bdc64
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 18:22:28 2014 -0700

        test

    commit db555dc12cf51f5b2d74b00c0666292bcbe78556
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 16:55:18 2014 -0700

        update

    commit 061a2f4aa4876a3970b2c8f56772c5ada661eef1
    Merge: 7ebcb2b 893637c
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 16:27:54 2014 -0700

        Merge branch 'master' into weiss

    commit 7ebcb2bc882fb41c390bee9d1189a93663947843
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 14:57:54 2014 -0700

        updated gitignore

    commit 2a28cf5e5b99b1a5decc93536fae0d45b7ffeaa2
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 12:41:14 2014 -0700

        symlink

    commit f52a41754d1423109e570050c0ee01dc50ab850c
    Merge: af35b28 f11839a
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 12:29:19 2014 -0700

        Merge branch 'master' into weiss

        Conflicts:
        	server/config/config.js

    commit af35b289535b754002c7ab7695013bf7721b610d
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 11:33:04 2014 -0700

        cleanup

    commit 938bb9b50c670cefe15ef7e0839ab9a3bfe47e34
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 21 21:05:24 2014 -0700

        up

    commit 72553b5bc34f7233af001d49a1dd1521a80f030f
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 21 20:52:59 2014 -0700

        removed images

    commit f2802208efebb5a1e9eddd613517f8cc3f055747
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 21 18:40:49 2014 -0700

        test

    commit e3f2c1873b84c56f74674b809fd203bb34c95de0
    Merge: 8dc2fbf 4f6fac7
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 21 15:59:58 2014 -0700

        Merge branch 'weiss' of github.com:cdrake757/drakefm into weiss

        Conflicts:
        	server/config/config.js

    commit 4f6fac7c203e36e9dbff8eec235e0cc1c6fa98e9
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 21 15:55:56 2014 -0700

        configs

    commit 8dc2fbf6babbf385f06d7226d7f3b8ff00ebcd77
    Merge: af1bdcc d0cd5e4
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 21 15:36:52 2014 -0700

        Merge branch 'weiss' of github.com:cdrake757/drakefm into weiss

        Conflicts:
        	gruntfile.coffee
        	server/config/config.js

    commit d0cd5e4a80297dc3c2d803dfb0ffb1b0d25fce80
    Merge: 3b02662 7dbc384
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 21 15:18:31 2014 -0700

        Merge branch 'master' into weiss

        Conflicts:
        	gruntfile.coffee
        	package.json

    commit 3b026624ed36bc33e913903be573a4bbc15b004b
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 21 13:56:57 2014 -0700

        using express 4

    commit af1bdcc8b1bc10179e9f6a6f06273481b9ae2e10
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 10 13:22:54 2014 -0700

        node inspector watch diff

    commit 7e31adb8ab0a985cdb207d471fcb8f2cc6f2f7cb
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 10 13:19:21 2014 -0700

        updating configs to seperate nodes

    commit 2a8a7a7bc5281b416a109da51daaa6d383eb6700
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 10 11:20:12 2014 -0700

        updates

    commit a69708dea5183e2b6b005166b82c4d95e275c8e0
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 10 11:14:30 2014 -0700

        up

    commit 0385dd6f4f34e85064fb641e144af6147f54be84
    Merge: 5348e45 0adb479
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 10 11:10:57 2014 -0700

        Merge branch 'master' into weiss

        Conflicts:
        	server/routes/weiss.js
        	weiss.coffee
        	weiss.js

    commit 5348e45c154e196b8372d1879ce6a7b4bcdd832d
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Wed Apr 9 22:14:47 2014 -0700

        removed extras from weiss

commit 06baa8cf4151c1a608e36fa1b3eb6ccba13ca1a3
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu May 1 18:59:22 2014 -0700

    rm

commit 7ab2124b3b8125b307ce954a1e00365d9860ab82
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu May 1 18:58:45 2014 -0700

    updated gruntfile

commit e92ef533c80674e3ce6fd1f14c756c6f381040d8
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu May 1 18:58:09 2014 -0700

    adding ghost as submodule

commit b3eeea9a2868b714fd6fd14289c1f9c59afba6cd
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Apr 30 21:35:12 2014 -0700

    updated images

commit 018b96c6a49d9184d9c5abe10279c8b15a85cfd5
Merge: 0b469bf 90bc39a
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Apr 30 20:11:09 2014 -0700

    Merge branch 'master' into weiss

commit 90bc39a33ccbdfbf8d9db9efa2fdedbcb4ba045e
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Apr 30 20:06:26 2014 -0700

    updated google analytics

commit 0b469bfeb5b712bc1a67674720a540d300dc5511
Merge: fc4f422 d3a60c4
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Apr 30 15:13:57 2014 -0700

    Merge branch 'master' into weiss

    Conflicts:
    	server/config/config.js

commit fc4f422704833978bc487e1550eabe3afee4b6bd
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Apr 30 15:12:34 2014 -0700

    merge to master
    Conflicts:
    	server/config/config.js

commit d3a60c45d61bd561e08ab2166f5be5e0eb2dfd30
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Apr 30 15:08:21 2014 -0700

    merge in all recent updates

commit 6a1bb36092a20a428028f47fb284f996dd683cd2
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Apr 29 02:12:49 2014 -0700

    adding touch icon

commit 9472864dbe5c053281a3154bc4000adf5fb158b8
Merge: 1457f05 9fa8c6f
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Apr 29 01:49:58 2014 -0700

    Merge branch 'master' into weiss

commit 9fa8c6f7e9fbf6c5e43c328a838cfa21bf9e002e
Merge: d911fe6 0cf2860
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Apr 29 01:48:40 2014 -0700

    Merge branch 'master' of github.com:cdrake757/drakefm

commit d911fe68d57cc043efdc975a6132e8ba72ab1b07
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Apr 29 01:48:05 2014 -0700

    updated gmapper

commit 1457f054e483e8cb65ca063fed9a9b8d6a2bc22c
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Apr 29 01:42:20 2014 -0700

    updates

commit 20d41e262ae90fa88c79446664f90a496516aaf7
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 28 23:49:58 2014 -0700

    rename

commit 0cf2860366755491ef7f9e97ed6c985f71398fed
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 28 23:17:04 2014 -0700

    updating stuff

commit 7c32aa3a231321ceb767ac361cc051530862c02b
Merge: 82b8b60 38935f5
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 28 22:41:00 2014 -0700

    Merge branch 'master' into weiss

    Conflicts:
    	server/views/includes/scripts.jade

commit 38935f5d0dcbba6368ef29fa67a1a1a729a8b9a3
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 28 22:36:55 2014 -0700

    new scripts

commit dc5c968dce598368375f9348ba0bdfa1d0fe177b
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 28 22:36:11 2014 -0700

    server

commit 758cddc1294aadf317f0f7b3c5e484c3c2951459
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 28 22:23:17 2014 -0700

    Squashed commit of the following:

    commit 82b8b602e9c160d7daee6aabef242d3cccff60d0
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 28 21:05:56 2014 -0700

        updates

    commit 112836f6ce09d0df57b410635587f972fecde584
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 28 20:53:52 2014 -0700

        link color

    commit e1c44bbe5a62abf1ce93dbb114af78fa83022adc
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 28 20:52:18 2014 -0700

        structure

    commit baa49d4daeac5687e2c27fab3d3daad1be272284
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 28 20:43:44 2014 -0700

        updated map

    commit 8ef526c10fdaea284f26a10fb1d6ff499ee0e02b
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Fri Apr 25 21:07:35 2014 -0700

        removed submodule

    commit a766e0f96639d728dcf55eeda3d6908a71c0770d
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Fri Apr 25 20:59:35 2014 -0700

        updated layout

    commit daf475b86a42556e4e2d4effd654db403a3a696e
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Fri Apr 25 20:21:36 2014 -0700

        no submodule

    commit 864df1ed5865f345dd279d82bf058fe23458dfef
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Fri Apr 25 19:52:31 2014 -0700

        test

        test

        test

        test

        test

        test

    commit b33703db44f1f861e6b03ab2d8f1a28596ee6cdf
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Fri Apr 25 19:39:31 2014 -0700

        adding ghost data

    commit 93239d4a0f6b4bc1cefa9b3978b6dcec22bb012c
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Fri Apr 25 15:49:11 2014 -0700

        fix links

    commit ae889dc3676ac72099f4233ffb189971847d5e65
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Fri Apr 25 15:31:50 2014 -0700

        added blog links

    commit 4f93bcba5a4c683f588f222937bf77404c999158
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 22:28:26 2014 -0700

        fix scripts

    commit fb2f4d8cd842dbb41a188d8627e7c1c0d2d3e560
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 20:29:16 2014 -0700

        test 2

    commit ed0075c06b7ce6e9705033333826257f9aefa2f5
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 20:27:03 2014 -0700

        test

    commit e6c6cfa27163d38270a3a2fee791a9b99f274fb0
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 19:54:10 2014 -0700

        test

    commit c045e24d81bef9a77bfd00f9bf448fb2b1abbc13
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 18:33:10 2014 -0700

        disable io for now

    commit d59241cd934d8b6ffc24c87c364d49f4b07bdc64
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 18:22:28 2014 -0700

        test

    commit db555dc12cf51f5b2d74b00c0666292bcbe78556
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 16:55:18 2014 -0700

        update

    commit 061a2f4aa4876a3970b2c8f56772c5ada661eef1
    Merge: 7ebcb2b 893637c
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 16:27:54 2014 -0700

        Merge branch 'master' into weiss

    commit 7ebcb2bc882fb41c390bee9d1189a93663947843
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 14:57:54 2014 -0700

        updated gitignore

    commit 2a28cf5e5b99b1a5decc93536fae0d45b7ffeaa2
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 12:41:14 2014 -0700

        symlink

    commit f52a41754d1423109e570050c0ee01dc50ab850c
    Merge: af35b28 f11839a
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 12:29:19 2014 -0700

        Merge branch 'master' into weiss

        Conflicts:
        	server/config/config.js

    commit af35b289535b754002c7ab7695013bf7721b610d
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 24 11:33:04 2014 -0700

        cleanup

    commit 938bb9b50c670cefe15ef7e0839ab9a3bfe47e34
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 21 21:05:24 2014 -0700

        up

    commit 72553b5bc34f7233af001d49a1dd1521a80f030f
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 21 20:52:59 2014 -0700

        removed images

    commit f2802208efebb5a1e9eddd613517f8cc3f055747
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 21 18:40:49 2014 -0700

        test

    commit e3f2c1873b84c56f74674b809fd203bb34c95de0
    Merge: 8dc2fbf 4f6fac7
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 21 15:59:58 2014 -0700

        Merge branch 'weiss' of github.com:cdrake757/drakefm into weiss

        Conflicts:
        	server/config/config.js

    commit 4f6fac7c203e36e9dbff8eec235e0cc1c6fa98e9
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 21 15:55:56 2014 -0700

        configs

    commit 8dc2fbf6babbf385f06d7226d7f3b8ff00ebcd77
    Merge: af1bdcc d0cd5e4
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 21 15:36:52 2014 -0700

        Merge branch 'weiss' of github.com:cdrake757/drakefm into weiss

        Conflicts:
        	gruntfile.coffee
        	server/config/config.js

    commit d0cd5e4a80297dc3c2d803dfb0ffb1b0d25fce80
    Merge: 3b02662 7dbc384
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 21 15:18:31 2014 -0700

        Merge branch 'master' into weiss

        Conflicts:
        	gruntfile.coffee
        	package.json

    commit 3b026624ed36bc33e913903be573a4bbc15b004b
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Mon Apr 21 13:56:57 2014 -0700

        using express 4

    commit af1bdcc8b1bc10179e9f6a6f06273481b9ae2e10
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 10 13:22:54 2014 -0700

        node inspector watch diff

    commit 7e31adb8ab0a985cdb207d471fcb8f2cc6f2f7cb
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 10 13:19:21 2014 -0700

        updating configs to seperate nodes

    commit 2a8a7a7bc5281b416a109da51daaa6d383eb6700
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 10 11:20:12 2014 -0700

        updates

    commit a69708dea5183e2b6b005166b82c4d95e275c8e0
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 10 11:14:30 2014 -0700

        up

    commit 0385dd6f4f34e85064fb641e144af6147f54be84
    Merge: 5348e45 0adb479
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Thu Apr 10 11:10:57 2014 -0700

        Merge branch 'master' into weiss

        Conflicts:
        	server/routes/weiss.js
        	weiss.coffee
        	weiss.js

    commit 5348e45c154e196b8372d1879ce6a7b4bcdd832d
    Author: Cameron Drake <cameron@drake.fm>
    Date:   Wed Apr 9 22:14:47 2014 -0700

        removed extras from weiss

commit 82b8b602e9c160d7daee6aabef242d3cccff60d0
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 28 21:05:56 2014 -0700

    updates

commit 112836f6ce09d0df57b410635587f972fecde584
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 28 20:53:52 2014 -0700

    link color

commit e1c44bbe5a62abf1ce93dbb114af78fa83022adc
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 28 20:52:18 2014 -0700

    structure

commit baa49d4daeac5687e2c27fab3d3daad1be272284
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 28 20:43:44 2014 -0700

    updated map

commit 8ef526c10fdaea284f26a10fb1d6ff499ee0e02b
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Apr 25 21:07:35 2014 -0700

    removed submodule

commit a766e0f96639d728dcf55eeda3d6908a71c0770d
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Apr 25 20:59:35 2014 -0700

    updated layout

commit daf475b86a42556e4e2d4effd654db403a3a696e
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Apr 25 20:21:36 2014 -0700

    no submodule

commit 864df1ed5865f345dd279d82bf058fe23458dfef
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Apr 25 19:52:31 2014 -0700

    test

    test

    test

    test

    test

    test

commit b33703db44f1f861e6b03ab2d8f1a28596ee6cdf
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Apr 25 19:39:31 2014 -0700

    adding ghost data

commit 93239d4a0f6b4bc1cefa9b3978b6dcec22bb012c
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Apr 25 15:49:11 2014 -0700

    fix links

commit ae889dc3676ac72099f4233ffb189971847d5e65
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Apr 25 15:31:50 2014 -0700

    added blog links

commit 4f93bcba5a4c683f588f222937bf77404c999158
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 24 22:28:26 2014 -0700

    fix scripts

commit fb2f4d8cd842dbb41a188d8627e7c1c0d2d3e560
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 24 20:29:16 2014 -0700

    test 2

commit ed0075c06b7ce6e9705033333826257f9aefa2f5
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 24 20:27:03 2014 -0700

    test

commit e6c6cfa27163d38270a3a2fee791a9b99f274fb0
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 24 19:54:10 2014 -0700

    test

commit c045e24d81bef9a77bfd00f9bf448fb2b1abbc13
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 24 18:33:10 2014 -0700

    disable io for now

commit d59241cd934d8b6ffc24c87c364d49f4b07bdc64
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 24 18:22:28 2014 -0700

    test

commit db555dc12cf51f5b2d74b00c0666292bcbe78556
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 24 16:55:18 2014 -0700

    update

commit 061a2f4aa4876a3970b2c8f56772c5ada661eef1
Merge: 7ebcb2b 893637c
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 24 16:27:54 2014 -0700

    Merge branch 'master' into weiss

commit 893637cd216c82c021b4759b5a58119e4efa0491
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 24 16:26:47 2014 -0700

    updating gitignore

commit 7ebcb2bc882fb41c390bee9d1189a93663947843
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 24 14:57:54 2014 -0700

    updated gitignore

commit 2a28cf5e5b99b1a5decc93536fae0d45b7ffeaa2
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 24 12:41:14 2014 -0700

    symlink

commit f52a41754d1423109e570050c0ee01dc50ab850c
Merge: af35b28 f11839a
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 24 12:29:19 2014 -0700

    Merge branch 'master' into weiss

    Conflicts:
    	server/config/config.js

commit f11839ab7a9d10a6892a31a1eb7a9e5099162f0a
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 24 12:27:08 2014 -0700

    added jsdoc

commit af35b289535b754002c7ab7695013bf7721b610d
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 24 11:33:04 2014 -0700

    cleanup

commit 3bf19f87bf38a619aaff89f4c0a0e13d97420694
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Apr 23 15:23:01 2014 -0700

    removing config on master

commit 938bb9b50c670cefe15ef7e0839ab9a3bfe47e34
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 21 21:05:24 2014 -0700

    up

commit 72553b5bc34f7233af001d49a1dd1521a80f030f
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 21 20:52:59 2014 -0700

    removed images

commit f2802208efebb5a1e9eddd613517f8cc3f055747
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 21 18:40:49 2014 -0700

    test

commit e3f2c1873b84c56f74674b809fd203bb34c95de0
Merge: 8dc2fbf 4f6fac7
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 21 15:59:58 2014 -0700

    Merge branch 'weiss' of github.com:cdrake757/drakefm into weiss

    Conflicts:
    	server/config/config.js

commit 4f6fac7c203e36e9dbff8eec235e0cc1c6fa98e9
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 21 15:55:56 2014 -0700

    configs

commit 8dc2fbf6babbf385f06d7226d7f3b8ff00ebcd77
Merge: af1bdcc d0cd5e4
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 21 15:36:52 2014 -0700

    Merge branch 'weiss' of github.com:cdrake757/drakefm into weiss

    Conflicts:
    	gruntfile.coffee
    	server/config/config.js

commit d0cd5e4a80297dc3c2d803dfb0ffb1b0d25fce80
Merge: 3b02662 7dbc384
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 21 15:18:31 2014 -0700

    Merge branch 'master' into weiss

    Conflicts:
    	gruntfile.coffee
    	package.json

commit 7dbc384a742e80b9505d602b8ce54fa927a571c6
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 21 14:50:07 2014 -0700

    updating to express 4

commit 3b026624ed36bc33e913903be573a4bbc15b004b
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 21 13:56:57 2014 -0700

    using express 4

commit af1bdcc8b1bc10179e9f6a6f06273481b9ae2e10
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 10 13:22:54 2014 -0700

    node inspector watch diff

commit 7e31adb8ab0a985cdb207d471fcb8f2cc6f2f7cb
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 10 13:19:21 2014 -0700

    updating configs to seperate nodes

commit 2a8a7a7bc5281b416a109da51daaa6d383eb6700
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 10 11:20:12 2014 -0700

    updates

commit a69708dea5183e2b6b005166b82c4d95e275c8e0
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 10 11:14:30 2014 -0700

    up

commit 0385dd6f4f34e85064fb641e144af6147f54be84
Merge: 5348e45 0adb479
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 10 11:10:57 2014 -0700

    Merge branch 'master' into weiss

    Conflicts:
    	server/routes/weiss.js
    	weiss.coffee
    	weiss.js

commit 0adb479161b9f11bb3ea85916033c4f2479b5f1a
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Apr 9 22:27:29 2014 -0700

    removing

commit 4814e381afd1bf8ccd29dff062987f5443fa8ae5
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Apr 9 22:26:22 2014 -0700

    removed Drake shit

commit a2ceb03d2a354c5414c96420090ce68b5e06ac29
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Apr 9 22:23:19 2014 -0700

    removed all but drake

commit 5348e45c154e196b8372d1879ce6a7b4bcdd832d
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Apr 9 22:14:47 2014 -0700

    removed extras from weiss

commit e56dfd5e5539184748906cdcf253c3c159a619f5
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Apr 9 21:30:11 2014 -0700

    removing ohm for sep branch

commit f6dccd95f96b1097c3e97c5c6c513162000d07eb
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Apr 9 21:17:34 2014 -0700

    updated images

commit b48147d3e311978c467eeb47ca9a65cc694e7cad
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Apr 9 19:54:17 2014 -0700

    removed weird image paths

commit cc16947e3e02f8e4a22f9086cb27667639aa42ca
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Apr 8 23:47:26 2014 -0700

    up

commit c23dbc12897fdb3e1ab86d5be421ba22912fdc1a
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Apr 8 23:42:03 2014 -0700

    adding my env

commit 418a54f92b107bfd09379140ed64b5448a4215f3
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Apr 8 22:04:21 2014 -0700

    removed ohm repo

commit f24513e35ffb715fd4dbf3ea2fb6e6356a79fc19
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Apr 8 21:55:12 2014 -0700

    up

commit bb872415b597f19c4d62daa25a270950b1a5589e
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Apr 8 20:11:06 2014 -0700

    update

commit 98f022a9cc1e04fb2a36c32b99001ee0b6c2eb2d
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Apr 8 15:48:05 2014 -0700

    updates

commit a3b0861057ba92af5bbcb296637265b4e4f1a9ac
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Apr 8 02:17:26 2014 -0700

    adding svgs

commit 6cf205167cf9909374b15dfe2e648de7c0e34cae
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Apr 8 02:14:24 2014 -0700

    fixed color interpolation

commit 395a27bb09f307fb48d0df2d673c40f676b8a40f
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Apr 8 02:04:29 2014 -0700

    fixed color interpolation

commit 22902092be6c71e5c9593e824850b08c80c67f57
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Apr 8 00:00:59 2014 -0700

    fixed color interpolation

commit 47829ffb75ae0cf01c32535f4aec947b798f8421
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 7 23:55:57 2014 -0700

    fixed color interpolation

commit 329b1ac7c9e5b10394bc086dc96028962f636bfa
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 7 23:52:32 2014 -0700

    fixed color interpolation

commit 50813dc409c75dcdddcf62bf5b3c257020fb0a97
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Apr 7 15:17:46 2014 -0700

    updating map and social tags

commit a5243aa5e77b488c2afbf8844d10d5108aa5b42e
Author: Cameron Drake <cameron@drake.fm>
Date:   Sat Apr 5 13:33:46 2014 -0700

    updating views

commit de4acd5f206e72080760a21503d4b44acf9076f7
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Apr 4 00:22:33 2014 -0700

    adding socket.io update

commit ca281c8ca735a60a16ba645204c114664cf4fd32
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Apr 4 00:01:26 2014 -0700

    exports

commit 570a39d2083ecdefd042561107f036d771da1424
Merge: f4c0640 185ed0a
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 3 23:42:16 2014 -0700

    Merge branch 'master' of github.com:cdrake757/boilerplate

    Conflicts:
    	server/routes/index.js

commit f4c064000fbac03946b832329eb432ea315192b2
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 3 23:37:54 2014 -0700

    up

commit 185ed0aefd44280b4ecd80167234082c548fe11c
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 3 23:35:16 2014 -0700

    added router

commit 8a22639d0522607dcf113d73b0271aa7131a84f7
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 3 23:21:05 2014 -0700

    updating the controllers

commit 7a7541d0a02d53b169983caeb02fbf7ac6b20a89
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 3 20:32:18 2014 -0700

    updates

commit 2a00f986d9d52868a01cd1fea11ab3a33765816f
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 3 20:16:33 2014 -0700

    Weiss site updates

commit 448f5ed5458c607eeceba05bccbdeaca5957419e
Merge: 5e35d4d 7cf5667
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 3 19:32:21 2014 -0700

    Merge branch 'master' of github.com:cdrake757/boilerplate

commit 7cf56676205012596d7ddc761e5fe6bf0ec4d66f
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 3 19:31:13 2014 -0700

    updates

commit 5e35d4d1c7cdf8fae39ffffd5e70b56726a00572
Merge: 2c6b1e6 d3941d4
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 3 19:26:12 2014 -0700

    Merge branch 'master' of github.com:cdrake757/boilerplate

    Conflicts:
    	dotfiles
    	gruntfile.coffee
    	server/config/config.json
    	server/views/includes/weiss.jade
    	server/views/index.jade
    	server/views/layout.jade
    	tutorials/readme.md

commit d3941d499560d8b23cb6ec1e77d6d818db8d92f2
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 3 18:37:43 2014 -0700

    removed maps added debug mode for gruntfile

commit 708aa080d9c05d2218de78e4c21449a898d3f87b
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 3 18:19:40 2014 -0700

    updating main app

commit 73a3482e07a44f9896a67590c5886df69de6e6cf
Merge: b63f046 ab4f76f
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 3 18:16:56 2014 -0700

    Merge branch 'master' of github.com:cdrake757/boilerplate

commit b63f0461c67f73e0dd4783f795bc6dff1db61e2c
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 3 18:13:56 2014 -0700

    adding APIs and views

commit 53f73a3babf5e517601fd323a0b4a0702a29b3f5
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 3 17:00:31 2014 -0700

    updating layout and dependencies

commit 2c6b1e63bbac4184c34777f5f6549881ccaf576b
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Apr 3 13:22:53 2014 -0700

    updating dotfiles

commit ab4f76fbf62eecc3aa94ac2e831043b3952e52bd
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Wed Apr 2 12:56:29 2014 -0700

    Update readme.md

commit 2ccc70963e28e62efd56b489b98a421839dd577f
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Apr 2 08:03:49 2014 -0700

    removing deploy

commit 76c1ad9b141e6d194cbcc4406ea38ee5b06d3b1e
Merge: da0638b 89cc543
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Apr 1 11:21:51 2014 -0700

    Merge branch 'master' of github.com:cdrake757/boilerplate

commit da0638bc1d2ad09cf93109c92ec2e3ea789ca4b7
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Apr 1 11:21:33 2014 -0700

    updating configs

commit 89cc5437d12a7644f6c60f6d6602d39a41e6eeac
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Mon Mar 31 16:52:35 2014 -0700

    Update readme.md

commit 40ffa66e53cc733304220f50bdf8fc875bece047
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Mon Mar 31 16:49:41 2014 -0700

    Update readme.md

commit df29c9581ebb1dca29b8fba8e319d86f08945bee
Author: Cameron Drake <cameron@drake.fm>
Date:   Sun Mar 30 22:11:59 2014 -0700

    updating deps

commit 52ef10e1b4e856f3586df54e0c0b4f64f3a9e405
Author: Cameron Drake <cameron@drake.fm>
Date:   Sat Mar 29 18:28:50 2014 -0700

    updates

commit 3f5e89ffbf854b9bf5ce37622bbcb286ad135a30
Author: Cameron Drake <cameron@drake.fm>
Date:   Sat Mar 29 16:49:20 2014 -0700

    adding underscore and d3

commit ee1f2737e98b324e3c1b56682ea2950a9ea9c7a8
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Sat Mar 29 13:39:30 2014 -0700

    Update readme.md

commit a0b25b3be66c5fea5cd699eb36dbbf1866589d0a
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Fri Mar 28 22:16:41 2014 -0700

    Update readme.md

commit 472bbce60fd026e189999f2dc5cee515c91b39d7
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Mar 28 21:58:07 2014 -0700

    up

commit a073644f8a7b8aa2fe9254deea4bdf13b2933f52
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Mar 28 18:06:14 2014 -0700

    removing deploy

commit f1df185f1412d1f66488ba2024059977b2b7f5c6
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Mar 28 15:12:47 2014 -0700

    removing tuts

commit 8561a02f7da9c9676531c880d76b347e7575ee4e
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Mar 28 12:44:22 2014 -0700

    updates

commit 2128ebcce2ad2ec4f9b886c82620a78e8695d7b3
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Mar 28 12:24:32 2014 -0700

    updating views

commit 2c900f64f7e345d916ce9ffadcb37443419cfaf9
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Mar 26 14:29:54 2014 -0700

    adding google maps

commit aa42e56d531cdd986fabef02bdcdfa5b31c6738f
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 27 20:48:01 2014 -0800

    removed my dotfiles, they need to be private

commit 6a2d2bef326a3ad67c845c18af597d48288e8ac4
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Feb 26 13:20:29 2014 -0800

    updating process

commit ba2e7849759824dcd7813f6820f103c37b44eaa4
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Tue Feb 25 02:47:46 2014 -0800

    Update readme.md

commit 4baedef3e9c7c258d423c48719590dedfcc8bbbc
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Tue Feb 25 02:39:18 2014 -0800

    Update index.jade

commit 5d30c6c4f5545daa9bdd6abc8e26c572b4e95f20
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Feb 25 02:31:16 2014 -0800

    typo

commit 0e0691ce533191ddc4b1f2b0143e8fd2feffa447
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Tue Feb 25 02:29:18 2014 -0800

    Update gruntfile.coffee

commit 3761c9f45ee927da94fedb4dc2399afeea0d2c68
Merge: 82d20ac 2f3b0b9
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Feb 25 02:26:31 2014 -0800

    Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	.gitignore
    	deploy/production/service.sh
    	deploy/stack/sites-available/drake.fm
    	drake.coffee
    	gruntfile.coffee
    	package.json

commit 2f3b0b92ac670bd113ba6bb66c0dae2cb66880bc
Merge: a43ebc3 a6d28c4
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Feb 25 02:01:46 2014 -0800

    Merge branch 'master' of github.com:cdrake757/boilerplate

commit a43ebc3d49ef2a4bbfd3efdd1e2551dffbb2afbd
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Feb 25 02:01:35 2014 -0800

    up jshint

commit a6d28c482307bcea296309e0b800fddb917a9f09
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Tue Feb 25 01:58:31 2014 -0800

    Update readme.md

commit 872ac309415f34e706663a5a676444346c62d858
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Feb 25 01:56:45 2014 -0800

    updating grunt and junk

commit 069e9000790c6d139a651e7e62ccb4693e29859d
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Tue Feb 25 01:50:15 2014 -0800

    Update readme.md

commit 82d20ac1bbde58522fb152bde1e0a51a81a4c2e5
Author: Cameron Drake <cameron@drake.fm>
Date:   Sun Feb 23 19:59:09 2014 -0800

    unecessary routes

commit 8fee2d37d148d94926e0b389202e6cc76a201b5e
Author: Cameron Drake <cameron@drake.fm>
Date:   Sun Feb 23 19:11:04 2014 -0800

    dumb update

commit dff894f91b0063f64bb09f77360d3c2ebfdef160
Author: Cameron Drake <cameron@drake.fm>
Date:   Sun Feb 23 19:03:30 2014 -0800

    missing js

commit 986323854f36ed3260d25bd71f3730fad8a9fd2e
Author: Cameron Drake <cameron@drake.fm>
Date:   Sun Feb 23 19:02:08 2014 -0800

    ups

commit 426736bd4bbd8b43e0f82030304925f9943deaf9
Author: Cameron Drake <cameron@drake.fm>
Date:   Sun Feb 23 18:57:49 2014 -0800

    updated routes

commit 85f10a186cb2658aaa391f79d112c76efd632bf1
Author: Cameron Drake <cameron@drake.fm>
Date:   Sun Feb 23 18:55:55 2014 -0800

    hotfix

commit 2ee8482182833e46536166218a446b9b4bc6b067
Author: Cameron Drake <cameron@drake.fm>
Date:   Sun Feb 23 18:47:01 2014 -0800

    missing js for weiss

commit 20db4c8d00c7063e4397ac6c156bc4ad5a0286c4
Author: Cameron Drake <cameron@drake.fm>
Date:   Sun Feb 23 18:43:28 2014 -0800

    more weiss fixes

commit 37949aca46f056e8090f8e24393f8a018e351baa
Author: Cameron Drake <cameron@drake.fm>
Date:   Sun Feb 23 16:15:51 2014 -0800

    merging weiss back in

commit 76232794d818f97d49ab1ff2330063301f7d0e81
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 22:59:34 2014 -0800

    Release v1.0.2

commit cad41a54f4763ceef7bf9c1c5fe85ed870f17416
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 22:58:28 2014 -0800

    final dotfile updates

commit 3a777fa62a9c4c29fee3e0924b199fe2c15a3aa6
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 21:29:06 2014 -0800

    updated dotfiles

commit 33ac0676a008bb42d0bac7ff9bf461a431a61e28
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 18:21:14 2014 -0800

    remove junk

commit edae221db4b7680d070a2e75df484df0c36cfb70
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 17:26:30 2014 -0800

    updated dotfiles

commit d83dbbab3c5449a689f2b746cc901fec7bd988d4
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 17:25:52 2014 -0800

    found another bug in dotfiles

commit fe0fa17361bb127ee9a80a46fa598591378bd403
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 16:47:27 2014 -0800

    remove unnecessary script

commit 68cef423f566aa6922d9e0018eeb80caf1a86c94
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 16:39:50 2014 -0800

    missing files

commit 2affd41968320aa988b0e09d7604dd050e980959
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 16:03:50 2014 -0800

    fix

commit 585b68ffc90efd80e6c3ce9dcd907d165d09a7a4
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 15:29:29 2014 -0800

    tidying dotfiles

commit 967c7bf85acbe3e7b65a8cfd383a9604abe883f2
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 15:27:44 2014 -0800

    no longer using dev_env, using dotfiles bootstrap instead

commit 7d716a68c276104f658fa8a506de9aa533cd6af4
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 15:11:16 2014 -0800

    Release v1.0.1

commit 0bea76b8f2a9d8896e2c45acacbb8ffc293c8b8e
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 15:10:27 2014 -0800

    update .gitignore

commit 49b2ac446245f4361fab2214621d79848df14aef
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Thu Feb 20 15:07:21 2014 -0800

    Delete .sshconfig

commit 7aa7612c8fc0ae54eee032726a18e88982b96753
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 15:05:24 2014 -0800

    missing some files

commit 08d073379a806f3dec87a1e62e10d8516b344790
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 15:00:13 2014 -0800

    updating gruntfile

commit 4b05690410be11f296e75048cf6e04aa827d18a6
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 14:50:34 2014 -0800

    updated dotfiles

commit 28b3d1b027c8b2e60fa0df344e605ec0667024a0
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 05:32:02 2014 -0800

    # This is a combination of 3 commits.
    # The first commit's message is:
    adding my dotfiles for real

    adding favicon

    adding grunt open, cachebusting doesnt work w/ Jade, and bump for versioning

    # This is the 2nd commit message:

    Release v1.0.0

    # This is the 3rd commit message:

    adding sshconfig

commit 147b4b00e955338f502b3eea80db158041a08ea1
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 14:23:11 2014 -0800

    ups

commit e56be4e4b8c63a2d03731f9c93390d607e34d749
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 14:22:20 2014 -0800

    adding sshconfig

commit 63ec52f47391e8a63ddc1ed531957b7b76cb2b23
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 14:13:59 2014 -0800

    Release v1.0.0

commit 47b31ded081ef7c37ca5f819210998197fee3444
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 14:13:34 2014 -0800

    adding grunt open, cachebusting doesnt work w/ Jade, and bump for versioning

commit 25674c95c091334ba73d3204100ebf2fe691a78b
Merge: 4e3bddd 2b2e6ba
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 05:20:13 2014 -0800

    updating deploy scripts

commit 2b2e6bac13b5c2a59de02d08c14eaf382aace5e7
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Feb 20 04:53:07 2014 -0800

    removing dotfiles, updating deploy

commit dca0f965a0c539533e6e340515c654c03d0abefa
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Feb 19 19:36:08 2014 -0800

    updating dotfiles

commit e44199eb03d919dfe5a1f7fe64a24a079a3b257e
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Feb 12 15:15:17 2014 -0800

    updating email to capture commits appropriately

commit d71bd0d9365d8d0158904b3b8c921904fcdda1cd
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Feb 11 20:58:02 2014 -0800

    updating images for imagemin

commit 2ec02c43437f3ec805cd0bcc8c7b9818a89c8548
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Feb 11 20:26:50 2014 -0800

    adding gitkeeps

commit 99efc93849adaec3885a717922c0ea025bd28576
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Feb 11 19:31:30 2014 -0800

    rearranging deploy

commit 4e3bddd02f3915ce750126a83637fb985484c16d
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Feb 11 19:22:19 2014 -0800

    updating readme and removing aws config

commit fc3e7bae3cbe179cc5b4d0e38bae34a75ecf5111
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Feb 11 19:11:12 2014 -0800

    hopefully cleaning up the repo a bunch

commit d1d5dd7812af68ede3e9c8eac80453c422054129
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Feb 11 18:21:39 2014 -0800

    moving deploy files and updating .gitignore

commit dcff91aa57ef75cd3fdb6b6f98aa5209b31aff59
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sun Feb 9 04:51:56 2014 -0800

    adding imagemin

commit ed7cf64133052662d8a4b6545388334b8930443c
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sun Feb 9 02:43:21 2014 -0800

    remove

commit 3a370cd2dfecc57d8ab90f8cd5d91d2757bc05b0
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sun Feb 9 01:44:34 2014 -0800

    removing tutorials that are in ghost

commit 17552adb07ebb472d3cf842e7782cb3bb97e3764
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sun Feb 9 00:41:21 2014 -0800

    stop messing with ghost

commit 28ea7fc40fde272d7b7692c061fd35ceff44b87e
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sun Feb 9 00:30:22 2014 -0800

    updating post hook

commit d2d4c248a66428a9c12eebc06e32805398ccf93b
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sun Feb 9 00:24:25 2014 -0800

    updated ssh config

commit 926acd0621d65fa1f75797f7c86ef18380c217a4
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 23:48:12 2014 -0800

    added mosh install

commit 3f45fab2e59a34479c89bdee4cb37a5efd1913f9
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 23:33:33 2014 -0800

    fixingbug

commit 2d4d9d1936b1c38f018874b34ea0a7cf167d3225
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 23:27:40 2014 -0800

    fixing bug

commit 5798e1010ee52ec102230f18fa37c85f93b8de54
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Sat Feb 8 23:11:45 2014 -0800

    Update prod_env.sh

commit da389ca83855161f282a11b0c100fd1d0843d67b
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Sat Feb 8 23:10:46 2014 -0800

    Update nginx.conf

commit c2ea12765eff19e66e332575d6f22e86f4f6d1f6
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Sat Feb 8 23:10:20 2014 -0800

    Update service.sh

commit 2bcdda0779d03b08a4541fb7b520f51c5f02a90e
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 22:59:59 2014 -0800

    updating configs for clean insatll strong-agent and compass-normalize

commit 3fdf877a60fad36dd051bfe3ba8b45f33b90ed31
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 22:35:52 2014 -0800

    fixing configs

commit 01887ac48d34948fc5daaef38527b8595820a7ea
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 21:29:42 2014 -0800

    updating gitignore

commit cfa2b21e44247aa0a270efefb9007b59d1aae581
Merge: d32bba8 702f0a6
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 21:09:04 2014 -0800

    Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	server/lib/deploy.sh
    	server/lib/nginx.conf
    	server/views/index.jade

commit 702f0a6b139a73b7f57fc3a6e21d13614b4a3ac2
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Sat Feb 8 21:02:28 2014 -0800

    Update readme.md

commit d32bba878f2c6fb39201e366b935b5b63f88cbbf
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Sat Feb 8 20:40:09 2014 -0800

    Delete parallax.jade

commit 074e66f8e4eb26aae1804258588de84d60c37b22
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 20:22:03 2014 -0800

    update

commit f2ffc46769f048abc16a0ecca636692596f94573
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 19:53:38 2014 -0800

    fixing nginx config problems

commit 4ad74fe78a320d7eea1bc53fbfe8faad87b5e16e
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Sat Feb 8 19:29:32 2014 -0800

    Delete .tm_properties

commit 404e58c1b86419a765de652a7c88be4178cfc1e7
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Sat Feb 8 19:27:57 2014 -0800

    Delete .hushlogin

commit 220e2b6b577aa3e6774580bde7f991adc9f62041
Author: Cameron Drake <cdrake757@users.noreply.github.com>
Date:   Sat Feb 8 19:27:49 2014 -0800

    Delete .screenrc

commit 92ddd2fd6e95233549bb2815f91b3ad74ec662e9
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 19:00:54 2014 -0800

    merging in upstream

commit 4a169c92375f4506a7f2fc0ae1bd8f26ca25d5d4
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 18:50:38 2014 -0800

    deleted junk

commit f11246e214725673af8f2e78c138427a9f18d8d2
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 18:42:19 2014 -0800

    updating server files

commit 235c61d668e3cf0b2b73dea3d37b5203e34d59e2
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 18:12:29 2014 -0800

    updates for boilerplate

commit f9bd20d395d61a35b2fdc00fab59eac3670d85a8
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 18:01:09 2014 -0800

    removing images

commit 291d8e5423e92703a97e57524637d645cbc8b9a6
Merge: d1018a2 903b76c
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 16:50:27 2014 -0800

    Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	.gitmodules
    	client/js/parallax.js
    	client/sass/_parallax.sass
    	client/sass/style.sass
    	gruntfile.coffee
    	package.json
    	public/img/favicon.png
    	readme.md
    	server/apis/AWS.js
    	server/config/prod_config.rb
    	server/lib/deploy.sh
    	server/lib/hooks/post-receive.sh
    	server/lib/hooks/pre-receive.sh
    	server/lib/nginx.conf
    	server/lib/service.sh
    	server/routes/site.js
    	server/views/includes/common.jade
    	server/views/includes/scripts.jade
    	server/views/index.jade
    	static/img/favicon.ico
    	static/img/favicon.png

commit 8bc8e94bbe4e4352e40a9b830637f7c8f63824cd
Merge: e7b450c 66e754b
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 16:50:27 2014 -0800

    Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	.gitmodules
    	client/js/parallax.js
    	client/sass/_parallax.sass
    	client/sass/style.sass
    	gruntfile.coffee
    	package.json
    	public/img/favicon.png
    	readme.md
    	server/apis/AWS.js
    	server/config/prod_config.rb
    	server/lib/deploy.sh
    	server/lib/hooks/post-receive.sh
    	server/lib/hooks/pre-receive.sh
    	server/lib/nginx.conf
    	server/lib/service.sh
    	server/routes/site.js
    	server/views/includes/common.jade
    	server/views/includes/scripts.jade
    	server/views/index.jade
    	static/img/favicon.ico
    	static/img/favicon.png

commit d1018a280a1ba5e4d3815265998224e193726d48
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 16:08:42 2014 -0800

    updating nginx configs

commit e7b450ce67107f608c2b50b30c574fea5b5df17b
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 16:08:42 2014 -0800

    updating nginx configs

commit 903b76c02f8de78182d3aeedd978dda2d7bf7c4b
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 00:46:34 2014 -0800

    successfully tested the install on ubuntu 12.04 YES

commit 66e754ba12d0088176b280052a02d4cec4bb1a5d
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 8 00:46:34 2014 -0800

    successfully tested the install on ubuntu 12.04 YES

commit 743b2242ef909fb70359b2052d69eca6322bb6c9
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 20:10:12 2014 -0800

    more cleanup

commit 63bd4850637746ea849222d7b0214b1b2c0ed23d
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 20:10:12 2014 -0800

    more cleanup

commit 383b3af6ed8a29d75fe1ac065a9519c021ce5d35
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 19:41:11 2014 -0800

    updating .gitignore

commit 55ee8744817c9bbfc84c4149dcbb7d560ba6c23b
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 19:41:11 2014 -0800

    updating .gitignore

commit 48736c7519a3309c7739cdc64414e30c51543f93
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 19:26:57 2014 -0800

    trying to clean up

commit c544390a9342a62da4e78016cddd9a55321bf96c
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 19:26:57 2014 -0800

    trying to clean up

commit d2a13485c2373ea662093e64ec32556c20de0e6d
Merge: 7042657 64609f0
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 17:24:43 2014 -0800

    Merge remote-tracking branch 'ohm/master'

commit ee16b2ad2cbab866258cd86d8b1aaa5966786f9b
Merge: f077ef5 038f1d3
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 17:24:43 2014 -0800

    Merge remote-tracking branch 'ohm/master'

commit 64609f0088e8609814312f529645b4a4c27a33d0
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 17:09:22 2014 -0800

    updating typo

commit 038f1d3a1677c7325af60b8e6ce899ba3387e193
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 17:09:22 2014 -0800

    updating typo

commit a7e8a32e23f0e8f3ec6000e06e370352d66e4e1f
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 16:59:03 2014 -0800

    fine-tuning shell scripts

commit 3d510bf1c4fa6eb86cc2bbd883a5254e6eb420f8
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 16:59:03 2014 -0800

    fine-tuning shell scripts

commit 71b2df71a12ef714b73afed56c182e6647d0a327
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 15:01:31 2014 -0800

    updating shell files

commit 8cd96320b3fae2990e49511dce4c1b145f6ebdc1
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 15:01:31 2014 -0800

    updating shell files

commit 4d7d948120cb90425c986348f06f92bcec691452
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 14:18:14 2014 -0800

    importing ohm.fm stuff

commit 0a198191eba6255bedbf3941f9024ea8580d8ded
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 14:18:14 2014 -0800

    importing ohm.fm stuff

commit 704265781f56a43c0d2ec5afc88707d9fd7b7744
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 13:26:27 2014 -0800

    adding Ghost blog platform

commit f077ef5d5cd45b87ac25634b8e53909632f9d169
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Feb 7 13:26:27 2014 -0800

    adding Ghost blog platform

commit 6c8add674e2daaf281ab9059903c6a86a33eb75f
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Feb 6 21:08:15 2014 -0800

    typo

commit b2f2be733631b3a15579bc413196fcb90177db97
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Feb 6 21:08:15 2014 -0800

    typo

commit e0f4ea82d713cecdbf8fc9d423fe67ef4cbf12af
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Feb 6 20:41:52 2014 -0800

    updating nginx config

commit da715012a58772b23b7ca25d776498226d7cca52
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Feb 6 20:41:52 2014 -0800

    updating nginx config

commit 78368628e7110e3dc4fda998f4e13fd921d5e101
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Feb 6 16:59:18 2014 -0800

    updating jukebox conf

commit 9279298f9ef6dc7a5818a06f9ecc779d514d76ab
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Feb 6 16:59:18 2014 -0800

    updating jukebox conf

commit 55d2ecd8f3dcf12ef222518ee6a46a727c3cb7df
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Feb 4 16:50:32 2014 -0800

    Update readme.md

commit 1959642cc3d1be14a8caab24942b8b5d37d3a9e9
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Feb 4 16:50:32 2014 -0800

    Update readme.md

commit 2a824d18880931a5e15da1465674365a29f8851d
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Feb 4 16:45:29 2014 -0800

    Update bootstrap.sh

commit 05043b1ebc644604a82448ab04e5726ed43b6841
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Feb 4 16:45:29 2014 -0800

    Update bootstrap.sh

commit 156e3246c1aba285b251720a2be8fcf452b5810f
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Feb 4 16:15:24 2014 -0800

    fixing the server files for ubuntu

commit 076a4753cb189890d41b6bf6b56330a2b06bcd52
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Feb 4 16:15:24 2014 -0800

    fixing the server files for ubuntu

commit f75a6fbd141531748d25e07bfefe7f4e61312743
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Feb 4 16:02:04 2014 -0800

    updating nginx conf file etc

commit 57e8f6fa3d9285ea5d691271aedf181fa3fd959d
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Feb 4 16:02:04 2014 -0800

    updating nginx conf file etc

commit 4a9345950d26ee4ec88753a0221ed3e968b154b5
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Feb 4 14:34:02 2014 -0800

    adding strong-ops and tidying up shell scripts

commit 32824f8e558d8250db0428444db71e2c2d5cefe8
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Feb 4 14:34:02 2014 -0800

    adding strong-ops and tidying up shell scripts

commit 197994a9ae4e049170ca5ae19af8fb7a9cc4f4b5
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Feb 4 14:18:48 2014 -0800

    adding strong-ops profiling

commit 3041ad40a75e679cba3e7aff68890bf97be39355
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Feb 4 14:18:48 2014 -0800

    adding strong-ops profiling

commit fc0dc3d59f4c8be07659680e8c94cbfd02228bf3
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 21:27:44 2014 -0800

    indenting

commit 77a1c4abcb86e4a429acac1c6147c001a5419c31
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 21:27:44 2014 -0800

    indenting

commit c5b99c3d44f511dd5493f8373b94d90409912bcc
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 21:27:03 2014 -0800

    adding a deploy script to install hooks separate from bootstrap

commit 8b26d3ca7aa4ccc61c12e11ac1d2da3ea655beca
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 21:27:03 2014 -0800

    adding a deploy script to install hooks separate from bootstrap

commit bb54aae24e8442f2045a3578c590eb51c940f91e
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 21:02:45 2014 -0800

    removing test

commit cef1b2d4a1ab2614d32faeb2e95144596ebe5316
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 21:02:45 2014 -0800

    removing test

commit 5c58410f44618e9d93b42394e30a663c562eaa04
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 20:57:55 2014 -0800

    last push, this one should successfully restart and all that

commit d6d5b7a16e8b9b0bc41e7f89d84b56476b741461
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 20:57:55 2014 -0800

    last push, this one should successfully restart and all that

commit c76b1844e5eb95a4bcfc9df348d4870b81db6d62
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 20:48:28 2014 -0800

    fixes

commit 2fe033623063e25eb6e79d643a84132d972dfa0e
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 20:48:28 2014 -0800

    fixes

commit 39fb6f8a9801504ddd26ef7402bac762e850e2fa
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 20:13:59 2014 -0800

    test

commit 4d3f8cc8e90866123ef007d018aedcf417c6e280
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 20:13:59 2014 -0800

    test

commit d424d7fdfd67543b42295df2960db077e96c4bee
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 20:10:14 2014 -0800

    test

commit 1029d1390524078d022b74f960614d3d5b4c3870
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 20:10:14 2014 -0800

    test

commit b202c75d0c6106e69b9fb4e6a1719243f64897f9
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 20:06:29 2014 -0800

    test

commit 9d73cb098759b4999bc34e4e12107db41a203914
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 20:06:29 2014 -0800

    test

commit fd68db054fd0212a3f4dabc5154e7fa5e81b2a04
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 20:02:51 2014 -0800

    one last try

commit c1e6990fa947e70192d90c3ddb8d7b98ba75503a
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 20:02:51 2014 -0800

    one last try

commit 695271346489009146b9cb4ccf4512aa520c93e4
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 19:57:18 2014 -0800

    adding one more dotfile to test

commit c74d5d64e750a23f5062bfeeb4d346589dd36f35
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 19:57:18 2014 -0800

    adding one more dotfile to test

commit ff874e0158fb554d4472c794663c8e9301b91552
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 19:53:23 2014 -0800

    updating the hook

commit 34bb9d1441c38277770c88fade799bb84c10f2f6
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 19:53:23 2014 -0800

    updating the hook

commit d2c31aaa20e83de1586a6a67da902763770dc7ef
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 19:47:45 2014 -0800

    try again

commit 3cbeecaf60ead02cfa1b45241893cf0862aaf677
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 19:47:45 2014 -0800

    try again

commit d0b9854b0e7a7f12b382cfb602a8a7c5a9446615
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 19:37:58 2014 -0800

    adding some dotfiles to test server

commit c1b720f5be9618331fb093ff7c08a2e86aec4a9e
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 19:37:58 2014 -0800

    adding some dotfiles to test server

commit c2e9639dd7d738e73db5a18f09a514fbae700251
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 1 03:32:41 2014 +0000

    updating scripts for git

commit 39f39fda5dac6e9355a04cbb3e0460f1b621ea98
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Feb 1 03:32:41 2014 +0000

    updating scripts for git

commit bec7ea36c0112adbf25da2b490d2d06c3bdb3bf3
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 22:21:22 2014 +0000

    adding a compile command for the linux service, also adding /usr/bin to to find global npm installs

commit 93f4609f47ab2f2b917fe9b151c7cf75526b98e1
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 22:21:22 2014 +0000

    adding a compile command for the linux service, also adding /usr/bin to to find global npm installs

commit e92659eb601c8c9231ffe7365640f7520706f0b5
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 02:32:22 2014 -0800

    ignore the server.js

commit a9006f0dc89f8ac30f0c3eef814d2ddfeb8d2cbc
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 02:32:22 2014 -0800

    ignore the server.js

commit b089bad693f9b489d016291ee034ed91cb9cd374
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 02:29:08 2014 -0800

    removing compiled server file

commit 9c9b2797ecf58ae1413df51abcf2ca312506eb4f
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 02:29:08 2014 -0800

    removing compiled server file

commit b3b9b5b2d533b715391cda111130553ff1010beb
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Jan 31 02:16:38 2014 -0800

    Update bootstrap.sh

commit 2f1f1cd53fc0bf551675ae7fc96958562ba07016
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Jan 31 02:16:38 2014 -0800

    Update bootstrap.sh

commit f2f30607a96c84563adf285f4e7dc5f63a8b76e9
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Jan 31 02:04:27 2014 -0800

    Update bootstrap.sh

commit ef60ba097f2ecbae7c101442576c44b95bff4794
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Jan 31 02:04:27 2014 -0800

    Update bootstrap.sh

commit 505bae310a03c42d69f864e755f48dea6f314dc9
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Jan 31 02:03:38 2014 -0800

    Update bootstrap.sh

commit 10609b4b6d6aea304d60dc5a3bc65aa581ed3248
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Jan 31 02:03:38 2014 -0800

    Update bootstrap.sh

commit bb2903bb009c7e945250c779a0e662626d8cc5ab
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 10:03:07 2014 +0000

    forgot pages

commit 9af7a88d4b50370516ba1745af23deff707c014c
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 10:03:07 2014 +0000

    forgot pages

commit 9368222fc0c2305ce38a5845cd80c2714cf4f50b
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Jan 31 02:00:20 2014 -0800

    Update service.sh

    simplifying install and making init for prod

commit a062e5024b686ab5f22c36d0d12efc5161ab96bb
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Jan 31 02:00:20 2014 -0800

    Update service.sh

    simplifying install and making init for prod

commit 67677c49cd2161062ffcb878d4909090ef429052
Merge: 504e105 ccc8849
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 09:49:02 2014 +0000

    merge

commit 3fa014c120ca6e7a5e77b469427a2b18aaadcc5a
Merge: 9ca1c19 9a22423
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 09:49:02 2014 +0000

    merge

commit 504e1057b27ac0072c90d4a0963d8dfeb693808c
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 09:42:19 2014 +0000

    updating site to work on server

commit 9ca1c1933b9c370b5789a185eeca5cdfe80d2f0d
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 09:42:19 2014 +0000

    updating site to work on server

commit 497ad029ee7a587e3e23a2f9438667e57a27864e
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 30 21:11:58 2014 -0800

    misspelled compass

commit fd5c72f1c77f3a4a2ae21e7057b926fcc85b0900
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 30 21:11:58 2014 -0800

    misspelled compass

commit ccc8849f1baf2d5dd723e47d3333768d6aca2217
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 30 21:11:09 2014 -0800

    Update service.sh

    misspelled compass

commit 9a22423b7a05f305e842091b5897998e24a55a45
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 30 21:11:09 2014 -0800

    Update service.sh

    misspelled compass

commit 9f9300cecbf18039b5c8e4cbc235b98b5ea18322
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 20:38:34 2014 -0800

    fixed missing package

commit 197935d2034a4fbbbe2e4b4b288a2b416acc16ae
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 20:38:34 2014 -0800

    fixed missing package

commit 05c95bb377d5f64754662e768d262e9a5a1f98f4
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 20:26:04 2014 -0800

    adding images back

commit 81b97954922d65215992d770c120b838e8212f33
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 20:26:04 2014 -0800

    adding images back

commit 512cb71faee2c8b89d748a4ab709c26d64601731
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 20:14:12 2014 -0800

    bringing over stuff from old repo

commit f016019fa01b07f953d10b19c0c18a9fba526cb6
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 20:14:12 2014 -0800

    bringing over stuff from old repo

commit d0bd57b2b65838d3eb999e726a4db67caa4854c8
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 19:05:37 2014 -0800

    merger

commit 589e67a50dbe2b4d3df35cccf4f9578d3dbbc810
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 19:05:37 2014 -0800

    merger

commit bd39d66335fef372a26d1543273d4515ecc8f2d5
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 19:05:37 2014 -0800

    merger

commit 8288f3099d2f02b2866f27e32158f75ce6361c66
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 19:05:37 2014 -0800

    merger

commit 7147b990492b5543a3bce3cece0dcea87a2eb602
Merge: f1f8f8d d4576d8
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 19:04:44 2014 -0800

    Merge branch 'master' into aws

    Conflicts:
    	boilerplate.coffee
    	boilerplate.js

commit d70f1ded3a9926a5d8c1df9da8f76d544f23ce9a
Merge: f1f8f8d 2861175
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 19:04:44 2014 -0800

    Merge branch 'master' into aws

    Conflicts:
    	boilerplate.coffee
    	boilerplate.js

commit 1afcca4ac07d321ebc2e47a9cc806f842e5dc4de
Merge: 3fdcb74 d4576d8
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 19:04:44 2014 -0800

    Merge branch 'master' into aws

    Conflicts:
    	boilerplate.coffee
    	boilerplate.js

commit 6779300831f2c4a75dd73547dda22f1518aa33df
Merge: 8a8ea0e 3b8319f
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 19:04:44 2014 -0800

    Merge branch 'master' into aws

    Conflicts:
    	boilerplate.coffee
    	boilerplate.js

commit d4576d860a6c254fb83263ec0b91ecabff822618
Merge: cc9fda8 48a0dbb
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 30 18:55:07 2014 -0800

    Merge pull request #13 from cdrake757/parallax

    Parallax Branch finished and integrated

commit 28611755c6dcaf969b50a4d44d8ef1d2aebbad9d
Merge: cc9fda8 6d01601
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 30 18:55:07 2014 -0800

    Merge pull request #13 from cdrake757/parallax

    Parallax Branch finished and integrated

commit 3b8319f698d0b09e863796750eabf4b31fbe2ef2
Merge: e04c786 4dfcd1c
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 30 18:55:07 2014 -0800

    Merge pull request #13 from cdrake757/parallax

    Parallax Branch finished and integrated

commit 48a0dbbc7f0bc3057a3306b8058578af3e502e75
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 18:54:15 2014 -0800

    ready for merge

commit 6d016012c9bbb5be3a5efc921bf4ae02240ecda8
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 18:54:15 2014 -0800

    ready for merge

commit 4dfcd1c4d6511b80d0af965029a50a6f25ac7896
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 18:54:15 2014 -0800

    ready for merge

commit 4b8f961ecccca41cc2c686d30a338ecbfde843ca
Merge: 17f75a8 cc9fda8
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 18:28:22 2014 -0800

    Merge branch 'master' into parallax

commit 1698329babd2666f3bdbf7a94f94c067faa06d1c
Merge: 3b0faa2 e04c786
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 18:28:22 2014 -0800

    Merge branch 'master' into parallax

commit 17f75a8c1582a02b988761ef5da8e1943af1065b
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 30 18:20:39 2014 -0800

    Update bower.json

commit 3b0faa226a20abe3d52ab64c02d810cdb16f4eb9
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 30 18:20:39 2014 -0800

    Update bower.json

commit cc9fda820f56b2ceedf0eb27692cc4394f5f5e4e
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 30 18:19:24 2014 -0800

    Update bower.json

commit e04c78663f59dbe83e4b549881f951908ca64483
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 30 18:19:24 2014 -0800

    Update bower.json

commit 50ecfecee7a191e358118a6d25c2acd3a379da82
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 30 18:18:03 2014 -0800

    Update readme.md

commit aed2d7f56efb4173d6ae5f8d25a9818096725c64
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 30 18:18:03 2014 -0800

    Update readme.md

commit 0d1d38fe6b307e82a9d9f9b816506f7e055a9be8
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 30 18:17:21 2014 -0800

    Update readme.md

commit e06ee5d1fb91db1a451ac56a26b05a3c555c55e8
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 30 18:17:21 2014 -0800

    Update readme.md

commit 97235b052f8856e5602f34c84d334db708cf0582
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 18:14:13 2014 -0800

    baller ass install process on dev son fix #2 and fix #12

commit e8d70dbb10056c8e44cbcec51f7b6a8fe56fa4f3
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 18:14:13 2014 -0800

    baller ass install process on dev son fix #2 and fix #12

commit 832b056d91c15bc81d7398c6f2cc233dc07f8d93
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 01:03:29 2014 +0000

    fixed the boostrap to prompt for dev or prod

commit 0dee4d000d15b291552dd48cfd847556a510097b
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 31 01:03:29 2014 +0000

    fixed the boostrap to prompt for dev or prod

commit cee2ffa83b4914f3c9542cec83427bf84700cf42
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 15:52:27 2014 -0800

    updating the layout and adding a bootstrap shell

commit d90f6412ebf1a41d868b13bf8485fc629a1bed6e
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 15:52:27 2014 -0800

    updating the layout and adding a bootstrap shell

commit 41ccd5f60005eae8fb3ac6545da889d7440cf9c5
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 14:53:55 2014 -0800

     adding psds

commit 74d601820a0195ad346c9c6ee3a81aebee7e0a8f
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 14:53:55 2014 -0800

     adding psds

commit 20a1066cea3a4cde9af0d51516f8cb28cbe8560a
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 14:48:52 2014 -0800

    basic structure down for weiss ortho

commit f1cdd0d61f48502697a9a20b9e526614260479cf
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 14:48:52 2014 -0800

    basic structure down for weiss ortho

commit 7a4d6e7ab6f396b96d965c6d661a86f3daf3ad15
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 10:53:02 2014 -0800

    nada

commit adfe44b8ef1f3498358f39ab31b3337877d8a344
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 30 10:53:02 2014 -0800

    nada

commit 348a60ce6fc6a2f50800e2b95fc4010e00cdcab8
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Wed Jan 29 13:21:18 2014 -0800

    adding form of @mathiasbynens dotfiles

commit a684c51502458aedbc0faea8e5db656f968ed04d
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Wed Jan 29 13:21:18 2014 -0800

    adding form of @mathiasbynens dotfiles

commit 8eba07764d680832a6f3bc598b776a6d2029d8e0
Merge: 2db0057 088a9e3
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Wed Jan 29 13:12:56 2014 -0800

    Merge branch 'master' into parallax

    Conflicts:
    	tutorials/readme.md

commit 4ff2c26bb3be0a03879d31b6d22af8c74ca0f6f3
Merge: 7029de6 fa33913
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Wed Jan 29 13:12:56 2014 -0800

    Merge branch 'master' into parallax

    Conflicts:
    	tutorials/readme.md

commit 088a9e358995f5db415e70481a4f20cf18f222c2
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Jan 29 00:30:40 2014 -0800

    Update readme.md

commit fa33913c1dc634331d5185acdc0a33090f9c9724
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Jan 29 00:30:40 2014 -0800

    Update readme.md

commit 4dd1ab690edb706efe24abed08e2cd53ea64b08f
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Jan 28 20:42:13 2014 -0800

    Update ssh.md

commit 1d5b5a9a9acf6dcc0c4e8a7c409555029df8a031
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Jan 28 20:42:13 2014 -0800

    Update ssh.md

commit 21df71e563201b98fba3ef6006b6cb8a516dc726
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Jan 28 20:36:47 2014 -0800

    Update aws.md

commit 0d25f22635535d8a22872de3ec2cdc0a3b91a7b6
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Jan 28 20:36:47 2014 -0800

    Update aws.md

commit 133b94bb85ad768d2da6d529654f521048edbded
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Jan 28 20:24:25 2014 -0800

    Update aws.md

commit 9af381af9559d92748129b24751c8682a53cf536
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Jan 28 20:24:25 2014 -0800

    Update aws.md

commit 1bdfe2a311e8879f7484238622235207b3b6f068
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Jan 28 00:27:32 2014 -0800

    Update aws.md

commit d8574cf3a7a0860ca991df870764093acb175fcd
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Jan 28 00:27:32 2014 -0800

    Update aws.md

commit b2e98d1eaf807d763801631379dab1823bc6d91e
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Jan 27 21:08:13 2014 -0800

    Update readme.md

commit ed03044efe9b55e8cf68b79e94574bacc4aa8fa0
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Jan 27 21:08:13 2014 -0800

    Update readme.md

commit ef25aeb0602b837b0d63344d7ffc1bd3e239776b
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Jan 17 00:24:54 2014 -0800

    Update readme.md

commit a5278d697c29089a385a47592ba036d74564313b
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Jan 17 00:24:54 2014 -0800

    Update readme.md

commit 8c6ff0efff40cfc5c728deda7a87d99db94406cc
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 17 00:22:30 2014 -0800

    wrong place

commit cfeff4edbc40a9bc34eed0c129125b6d78ec25bf
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 17 00:22:30 2014 -0800

    wrong place

commit 36fe8f521c680fe8ad4b2e5c1e8f6b38395d5c8e
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 17 00:08:28 2014 -0800

    forgort .jshint adding deploy tut

commit 89230205dd1bdef46a09a6f677cdb9757dd0b9e7
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Jan 17 00:08:28 2014 -0800

    forgort .jshint adding deploy tut

commit 2db005744c3d01d5e881ad6b67087bddc64071e4
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 16 23:59:20 2014 -0800

    forgot jshintrc

commit 7029de68e0a411bf10c7d3be8162e553ec3c4669
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 16 23:59:20 2014 -0800

    forgot jshintrc

commit 350da1d3f06c1853c2c5fadd97e7b3e38a6cca35
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Jan 15 16:58:44 2014 -0800

    Update readme.md

commit b11168121e78f564eb37cefacfb605c9ea84d8f2
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Jan 15 16:58:44 2014 -0800

    Update readme.md

commit 3ebe698c9520de45494f610624c527b79e1d6897
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Jan 15 16:51:24 2014 -0800

    Update deploy.md

commit 225a50c7864e7fbddfaa11310cbcf9d15a05ad49
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Jan 15 16:51:24 2014 -0800

    Update deploy.md

commit 2afbbfa3c69275e0fa7126cc9c50ea8558476856
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Jan 15 02:19:01 2014 -0800

    Update deploy.md

commit 47714f2d423d91d49ddc88cae130a618e63c29ef
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Jan 15 02:19:01 2014 -0800

    Update deploy.md

commit 35d89875e9bf74e166418a30c2bb9bbe1268866b
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Jan 14 17:23:48 2014 -0800

    adding tutorail for deploying using git

commit 0362fd7d30502a21b871d7edbee8e63f12bdd448
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Jan 14 17:23:48 2014 -0800

    adding tutorail for deploying using git

commit 2fc345c97a520b1e80bc1e000ef5c4663682bc57
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Jan 14 00:04:47 2014 -0800

    adding bower and rebasing

commit 740008ac2c64d227cd24b8f734f3e74af24893ac
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Jan 14 00:04:47 2014 -0800

    adding bower and rebasing

commit cda0923553f325d5028962bc76d5f81d752fc668
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 21:00:48 2014 -0800

    changed images

commit 7c5dea72479e91949520bcf3b0b1b5dfed563819
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 21:00:48 2014 -0800

    changed images

commit 0e4907927918f3ea6c5ae11ea0f22fdf998caaab
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 20:09:11 2014 -0800

    added images

commit bd6ffdebe0c482f694d0c25f92b4c9ecdd968926
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 20:09:11 2014 -0800

    added images

commit f100de62796ec2f7d7461f357c2a92ea68f6564d
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 19:37:01 2014 -0800

    creating a parallax js

commit c2f2aaca19b7ef6720fcd68ba46e408e45ce8552
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 19:37:01 2014 -0800

    creating a parallax js

commit 6491bb7c1428c16033a4f50486b592ce4d262ffc
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Jan 4 16:50:13 2014 -0800

    adding skrollr parallax library with the menu and stylesheet plugin

commit 0707721ef27c052ba88b1db8b0e4d64a00b7fbc2
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Jan 4 16:50:13 2014 -0800

    adding skrollr parallax library with the menu and stylesheet plugin

commit f9a801e9abcbaa933650e7d9f752ce3a5af1660c
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 16 23:04:01 2014 -0800

    Update gruntfile.coffee

    added comments for clarity

commit 10b1805b5cce53a97b1044599974ee17ffd37af4
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 16 23:04:01 2014 -0800

    Update gruntfile.coffee

    added comments for clarity

commit 1adb113a1d80a8bea95b8f2e7a8999df70ab5023
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 16 22:47:56 2014 -0800

    Update readme.md

commit 5d3b1c9ce4b31a338c97831a9ed15aa76113c8b8
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 16 22:47:56 2014 -0800

    Update readme.md

commit 6218c4b957dafefff4050e1cfe67cec1d39d2110
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 16 22:35:14 2014 -0800

    Update readme.md

commit a1d376fe61e5c3a39f5611ed5300328318c858e7
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Jan 16 22:35:14 2014 -0800

    Update readme.md

commit 21c871d8ebc8b3531088f403cd1c93424c07d047
Merge: 69556a3 2d7601a
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 16 21:15:30 2014 -0800

    Merge branch 'master' of github.com:cdrake757/boilerplate

commit 52dcb7f3ab5789b9c9a67b8ccd67148d1ffc88df
Merge: 9c7b2b1 a543394
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 16 21:15:30 2014 -0800

    Merge branch 'master' of github.com:cdrake757/boilerplate

commit 69556a385243df6d35953f9967d898ccf899128e
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 16 21:15:10 2014 -0800

    added browser sync for css injections and plato for js vizualization

commit 9c7b2b1a3942c796dd053260cc8d78c0cb44c1eb
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Jan 16 21:15:10 2014 -0800

    added browser sync for css injections and plato for js vizualization

commit 2d7601a118ad2373d428bd371c06b1a6ff62f0fc
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Jan 15 13:37:37 2014 -0800

    Update aws.md

commit a54339428d02fc45d844374144f9c5deb6c5eaf5
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Jan 15 13:37:37 2014 -0800

    Update aws.md

commit 5d5362038a89fc5013c40b34b64bb0d8675e3fb2
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Jan 14 00:22:34 2014 -0800

    Update readme.md

commit c4563b613ab7198c08bdc6484be3fa385aa240cd
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Jan 14 00:22:34 2014 -0800

    Update readme.md

commit e505c705f6e8c0c20969c10524fd73cb0c8b968a
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 13 23:47:41 2014 -0800

    adding bower for client dependency management

commit 0cb4ea6a04b98d4e919209b5202873835f667841
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 13 23:47:41 2014 -0800

    adding bower for client dependency management

commit a053e0345e50c510ffc75ad5a52d79465410fff3
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Jan 7 14:53:14 2014 -0800

    tidying up

commit 91106e746999795bf197300c0d04a6dac7ab556f
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Jan 7 14:53:14 2014 -0800

    tidying up

commit ef0266ac5d9f6a756adbc9bcec043952ea7abce1
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Jan 7 14:01:57 2014 -0800

    typo

commit 3e2e199a35849ce37beccffa97febab91e2ad76f
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Jan 7 14:01:57 2014 -0800

    typo

commit 85b714b93e9794b467fc9f6e1bcef01faaa878be
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Jan 7 13:49:17 2014 -0800

    updated readme

commit 2f85918237e1c187e37a53458de038cac695eaa3
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Jan 7 13:49:17 2014 -0800

    updated readme

commit f01267dc1ff8ff94433b70d97fd2bafcc1f91ae7
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Jan 7 13:41:19 2014 -0800

    tuts

commit 5758e319addb239d9f70378ced85a9e9ae70ddcd
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Jan 7 13:41:19 2014 -0800

    tuts

commit f1f8f8d6043902357edaa008f9466c8308079d01
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sun Jan 5 13:20:38 2014 -0800

    wip loading s3 buckets

commit 3fdcb7443c770de30a5abeaf5902fe1dd58f0c45
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sun Jan 5 13:20:38 2014 -0800

    wip loading s3 buckets

commit 8a8ea0efcb8e02680eb87a8815a06b2eb5fc2b67
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sun Jan 5 13:20:38 2014 -0800

    wip loading s3 buckets

commit 1e895c47de2dc695b97510b2b81b542a906c675b
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Jan 4 17:30:24 2014 -0800

    initial aws integration

commit 6bb632a4ee545c29c763878302eac98e6c041ed6
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Jan 4 17:30:24 2014 -0800

    initial aws integration

commit 7f22da60c3c1586b05c7f93669a75ea00949dae7
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Jan 4 17:30:24 2014 -0800

    initial aws integration

commit 907387d57ff7afd34f264b4e2f283fc435d4d983
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 19:17:00 2014 -0800

    tuts

commit 97a0539185b7cec5eff9948326f06b1a077d9175
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 19:17:00 2014 -0800

    tuts

commit cdd35d70764e948aa0051a771941407bef5cf63b
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 19:15:38 2014 -0800

    tuts

commit a2fc15e97dff8ff13f9e3e5a766f800997fe1143
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 19:15:38 2014 -0800

    tuts

commit da38c61ff413440fe31a5d4a03a95fb2586b035a
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 18:24:05 2014 -0800

    tuts

commit 00d9d8d8010d6d6fc2cb2bd6a547559d857308a6
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 18:24:05 2014 -0800

    tuts

commit b90977f951aa58c87d353323a9e3d2595d3265fe
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 18:23:42 2014 -0800

    tuts

commit 366bec194e4ed87e024d62cf7c21765886c993fe
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 18:23:42 2014 -0800

    tuts

commit 2ad7a3020d0e04286b5aceeba8f463fcb284405c
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 18:15:20 2014 -0800

    tuts

commit de81ecfc966104cb2c24b9436e0604bf16d52613
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 18:15:20 2014 -0800

    tuts

commit 09f8b154b905865d1f46bca1d20acc876a816eec
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 18:10:54 2014 -0800

    tuts

commit f6805c1aca6aaa7a15bcce4d6d87ae328967c9c5
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 18:10:54 2014 -0800

    tuts

commit 67f1f9ce374a720f49bd5e109d21366e6c9c2737
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 18:00:57 2014 -0800

    tuts

commit 33d015bf09b6e5d49846192e7586bcf94e4fc042
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 18:00:57 2014 -0800

    tuts

commit f6c480319535f562e81872060667e9dcadefbf83
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 17:56:48 2014 -0800

    tuts

commit 3e8cfd0ceeea830de3d8beaccb23723eb21818d6
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 17:56:48 2014 -0800

    tuts

commit 6809e7441cf8d02f0cff76f5603639d3664cc2c3
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 17:19:58 2014 -0800

    tuts

commit 3eafe3e89957517a31953183693037074aea5d88
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 17:19:58 2014 -0800

    tuts

commit a4a563c9e5dccf381f00d6a359d0814b11033ec8
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 17:16:23 2014 -0800

    tuts

commit 4097a0c3962db8501e6756c6fe724e18d8e32a60
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 17:16:23 2014 -0800

    tuts

commit 67fa07557f38bdd5ebaf6c7961bc92e318c65b69
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 17:13:15 2014 -0800

    tuts

commit c791ab2a9e1bb2c1f484d903695040834cef7a7e
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 17:13:15 2014 -0800

    tuts

commit d44afaeea50e13125cf8b9084085b1e28cacac78
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 17:11:03 2014 -0800

    tuts

commit 35b94bc5f2fda6e37e0ce8f9ae05db33faa9b328
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 17:11:03 2014 -0800

    tuts

commit c07691330113bf070841643637472d5a93fcbaed
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 17:09:40 2014 -0800

    tuts

commit b800704fda67c3d0b9a0d2cbaccc408f158bee84
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 17:09:40 2014 -0800

    tuts

commit 8f997996fa52fe7cabcee43ae29a68d5d51aafe2
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 17:07:59 2014 -0800

    tuts

commit bf7e9eb36d695c5854e7e7bfd66e978968010e67
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 17:07:59 2014 -0800

    tuts

commit 0d7f0bfd936eb238bee0da870394be9d637308f5
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 16:50:25 2014 -0800

    tuts

commit d41935b13e15dc8b0617e164a5037dfed8599f9e
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 16:50:25 2014 -0800

    tuts

commit 4b53c4ba0a8ddf1eb536eb95dcdd6d9e07723f29
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 16:40:22 2014 -0800

    updates

commit d1f4545abd24ddb3767cbe33f6a620603d569ba9
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 16:40:22 2014 -0800

    updates

commit 487ae964cf98402fc03ec53f66dc5642bab007c8
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 16:20:08 2014 -0800

    updating tutorials

commit b101c39b0e48793d42f0d9a5b71bdc12ca05f62d
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Jan 6 16:20:08 2014 -0800

    updating tutorials

commit dcc102a87b0025fb49fa3213cf2853b48c5c848c
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Jan 6 15:25:46 2014 -0800

    Update readme.md

commit 62dba651bbcf6768969ace7340f829a377d3a680
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Jan 6 15:25:46 2014 -0800

    Update readme.md

commit f83c2fcf77a0b067269753836d7bdb9c99a7cf53
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Jan 4 16:54:32 2014 -0800

    updating the scripts

commit 17931cb2b3eabf386e7c893ff2655d7f313e9551
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Jan 4 16:54:32 2014 -0800

    updating the scripts

commit 8f69041689b79184c2e677a161e2b095a5b4809f
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Jan 4 16:47:45 2014 -0800

    updated gruntfile

commit 23d0de2971c848874af6fc5633fb827b2c09571b
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Jan 4 16:47:45 2014 -0800

    updated gruntfile

commit 3ece27bb8c151dcd43e2a7e2b8be50d5176b2e67
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Jan 4 16:18:54 2014 -0800

    updated doctype per jade update

commit b956666ffaeccbb960104bff299cebc4eda05090
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Jan 4 16:18:54 2014 -0800

    updated doctype per jade update

commit 8e31ee3217a2bff512e230a036e25db0d2d02251
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Jan 4 16:12:23 2014 -0800

    updating css and layout

commit 45e8868184304bbdec303f68c9ba2f4efbf57487
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Sat Jan 4 16:12:23 2014 -0800

    updating css and layout

commit b15db91b5c4499357e8a9dddad82194b09f5d0c2
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Wed Nov 27 16:18:11 2013 -0500

    removing compiled static files, updated the config to change js to minified in production

commit b71c60bb5f7488eca8e93cd4be31395684966239
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Wed Nov 27 16:18:11 2013 -0500

    removing compiled static files, updated the config to change js to minified in production

commit 83f9c30f9cea2112174de9d4f8c482e78b79a9ea
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Nov 15 14:38:52 2013 -0800

    update js based on environment

commit 7c95fcdea28dbaa394bdebc2501b3a3d2ae93129
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Nov 15 14:38:52 2013 -0800

    update js based on environment

commit 40b1f44214c898a754a5cbfa148a00f8ef2d6f55
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Nov 15 14:33:26 2013 -0800

    update

commit 379de14abbe2048a225d2d606cb755f8a0d97c9d
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Nov 15 14:33:26 2013 -0800

    update

commit 6865de8d46aa433c101ffb300d0d2ead815b8f25
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Nov 15 14:31:02 2013 -0800

    update

commit 9430d4760f3c18c5b7d8cbaf8c122fd942c10021
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Nov 15 14:31:02 2013 -0800

    update

commit 800ff14f73ec92994680f169d521f6beb9a8b1a5
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Nov 15 14:22:14 2013 -0800

    updated tuts

commit e8f9e4a0ff0ef912ba0cddea05c16663c1f0f77e
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Nov 15 14:22:14 2013 -0800

    updated tuts

commit 2650362e02c371b7bbe406793f7e93d1017055bb
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Nov 13 16:36:11 2013 -0800

    Update aws-nodejs.md

commit 7526c147b4921a98fe9d106aed86aad36d6e03e1
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Nov 13 16:36:11 2013 -0800

    Update aws-nodejs.md

commit 172418feec9da0cba94fd91388ef762b9becee61
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Nov 11 15:19:08 2013 -0800

    Update aws-nodejs.md

commit 6efa81b24239d3ddecfe99f7c1c4ca19ba7deb93
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Nov 11 15:19:08 2013 -0800

    Update aws-nodejs.md

commit b6095f4a2c9a108a5f85246d1d328e06ff2c05df
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Nov 8 11:57:49 2013 -0800

    Update git.md

commit c594bed0f698700b8e787ab25ea67a77fdb1266e
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Nov 8 11:57:49 2013 -0800

    Update git.md

commit 5af821515650cbca3dbdd78768adc1869ec47207
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Nov 5 12:42:04 2013 -0800

    updated tutorials

commit da6bfc99c618ac72312a8ce02029af5493d59e48
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Nov 5 12:42:04 2013 -0800

    updated tutorials

commit 87760edb0a9f06139a1d5c25aeee13be4b651405
Author: Cameron Drake <cameron@drake.fm>
Date:   Sat Nov 2 17:32:22 2013 -0700

    Update git.md

commit 78215d8d332bd7227a23c2e43215f052e71dcbd8
Author: Cameron Drake <cameron@drake.fm>
Date:   Sat Nov 2 17:32:22 2013 -0700

    Update git.md

commit 9d3599090bbc0c6fbda40da9217a27a6f6d282cf
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Oct 24 17:43:45 2013 -0700

    Update git.md

commit 19134c027bdde2be2d571a67fa7870b0e99f93ae
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Oct 24 17:43:45 2013 -0700

    Update git.md

commit 34c4b824a50951998d0e3efdd1ba975f24123738
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Oct 24 17:37:51 2013 -0700

    Update readme.md

commit dc382ddc9d6aad33fae5c1259d2b960f0dd81a59
Author: Cameron Drake <cameron@drake.fm>
Date:   Thu Oct 24 17:37:51 2013 -0700

    Update readme.md

commit aee8d06cf2278725c95ce0dd0af8ec66e63a2ef5
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Oct 24 17:06:46 2013 -0700

    updated app structure to make more sense, replaced style.sass which was accidentally deleted.

commit 803e9146e389b2ebbd2cf2178e1aed1e73606c95
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Thu Oct 24 17:06:46 2013 -0700

    updated app structure to make more sense, replaced style.sass which was accidentally deleted.

commit b52689a83a09ac618f2b7eb6ca124c636dc54e51
Merge: 140e1bc 8a872c1
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Oct 22 19:27:52 2013 -0700

    Merge branch 'master' of github.com:cdrake757/boilerplate

commit 140e1bc8e08294631a3ab794e7f538391b1d95fa
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Oct 22 18:23:37 2013 -0700

    added a tree for suggested structure

commit 3632c509203c40e25b70e6c3e535cee615b64941
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Oct 22 17:51:42 2013 -0700

    updated package.json

commit 8a872c19810b761a618c1175122042889630c923
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Oct 22 14:53:25 2013 -0700

    Update git.md

commit 0276a249bba8e29037e42870ca9b5790195d16d5
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Oct 22 13:16:38 2013 -0700

    Update readme.md

commit 7d18980445a4a90dba1bce3f0769e2aa5a764ab7
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Oct 22 13:14:44 2013 -0700

    Update readme.md

commit dfbe0ebd4a8a22e5240a577cc42c60591e2a0668
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Oct 22 13:10:05 2013 -0700

    Update git.md

commit 56351e75183f3db8cc4a4678e000bece84704d7c
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Oct 22 13:02:35 2013 -0700

    Update git.md

commit c3d6c2b5d738debf81e67755ec28e405f88f8a78
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Oct 22 13:01:26 2013 -0700

    Update git.md

commit 065787fa0c228f87ebc9da6c305347f79e008a63
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Oct 22 12:50:21 2013 -0700

    Update git.md

commit 055957e556425e047a13aebad9ae4cb7cb7226c4
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Oct 22 12:41:43 2013 -0700

    Update git.md

commit 845752c1678dc3698a37ba2b01a2c7dd350c9b34
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Oct 22 12:00:18 2013 -0700

    Update readme.md

commit bec3f34c1165d31fb6b35b1213f7f45752956cca
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Oct 22 11:58:41 2013 -0700

    Update readme.md

commit 677da356ae8d5270617403ed73674bbf7828fde6
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Oct 22 11:56:43 2013 -0700

    Update readme.md

commit fd0104641f72098216c3477d5f61d3cb760a8f7e
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Oct 22 11:55:21 2013 -0700

    Update package.json

commit 69b4cb12166b11e5d016cf79448e0b711c4163d5
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Oct 22 11:50:42 2013 -0700

    Update readme.md

commit e23b4fd6dee68c99e8d54a53a6f6a218ace30748
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Oct 22 11:43:54 2013 -0700

    Update readme.md

commit 37e4966fa92a0add0c6f08a542d21207b7a06c02
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Oct 22 11:26:32 2013 -0700

    updated the tutorials

commit 01ede7e06c3adc19bca6763fb401cda94a92f635
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Oct 21 21:19:32 2013 -0700

    Update readme.md

commit 5b1d6de9fe88e0229f66f26057a50345269bf01f
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Oct 21 21:12:34 2013 -0700

    na

commit 29d488b0ab315cfbcdf6e3a1f8dd5a4f2a1c3205
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Oct 21 21:10:58 2013 -0700

    updating tuts

commit 2e7ce6aad9c148172470a621a85249caced38d34
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Oct 21 20:28:01 2013 -0700

    more updates

commit 287ed66e8eb1ea697a95482048a7b4472615178d
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Oct 21 19:41:36 2013 -0700

    up

commit 9c53eb58bb6117b99b43781f203130b0f3cccee7
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Oct 21 19:40:46 2013 -0700

    update

commit 9b62f846f6deb8ef4009e64ab455792b03e48e24
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Mon Oct 21 19:30:22 2013 -0700

    added my design notes

commit 87fb6d96cd6811fdfe9fcd5f9a5a4b3befb834c4
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Oct 21 18:33:03 2013 -0700

    Update readme.md

commit d9353dba4dbd0854c0bad650349c6286a5179823
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Oct 21 18:30:24 2013 -0700

    Update GitFlow.md

commit 628e9c4bb0d668afde62f971acddd41ce486e000
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Oct 21 18:29:50 2013 -0700

    Update GitFlow.md

commit adf7c2644cee23581ad92b0ff57806ed21e5fb4f
Author: Cameron Drake <cameron@drake.fm>
Date:   Mon Oct 21 18:26:56 2013 -0700

    Update GitFlow.md

commit 2dac522592e21db31fb9d36d6c3a0991dac19d53
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Oct 11 17:53:20 2013 -0700

    updated tuts with git

commit a62ed310d814becdb00868ec530f10bcd4be7111
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Oct 11 14:35:15 2013 -0700

    Update readme.md

commit 93873bbf8b1974737f7cb7e69712d3800817b4c2
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Oct 11 14:33:37 2013 -0700

    updated readme

commit b4d58c4b53939cf808fb41599c0d879a8b6d2631
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Oct 11 14:32:21 2013 -0700

    Delete CSS-styleguide.md

commit 480ecfd28844d3e740d8ec7848d3b5225a59572d
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Oct 11 14:31:07 2013 -0700

    added tuturial through submodule

commit 9cb20d2e254a5932e18c64ceb1de5c3a61424dd4
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Oct 11 14:20:44 2013 -0700

    prettying up shit

commit 18b63e24b2293074d0f86a0eaec7c3c3c04cc373
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Oct 11 14:15:21 2013 -0700

    typo with base.sass

commit dce31301316edd8c0a681d9eb2e5ff818568fdc8
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Oct 11 14:12:38 2013 -0700

    removed the submodules, not quite necessary yet

commit c79eaa840b5eb4262834d46debe134a0de3c8744
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Oct 11 14:05:10 2013 -0700

    using the compass port of normalize over the submodule... easier

commit 13c0260ece0469c114bcd56962a3ed90f57d4fc3
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Oct 11 13:44:12 2013 -0700

    updated readme and running on port 8080 now

commit 274a10314812021d1efb7f3fa57546e20c7e3cc4
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Fri Oct 11 12:58:23 2013 -0700

    updated to include css libraries as submodules

commit 0c30f6b904d5a55c68d704acd1ccae90ed9c8540
Author: Cameron Drake <cameron@drake.fm>
Date:   Fri Oct 4 12:01:04 2013 -0700

    Update SettingUpTheStack.md

commit 3d84f017afd2bbb05793b3e3df8de139be489d86
Merge: 69d68da 1cade33
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Wed Oct 2 17:52:03 2013 -0700

    Merge branch 'master' of https://github.com/cdrake757/nodejs-boilerplate

commit 69d68da1bceaffbf6ee3f5df49d1f8eccd3ae33f
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Wed Oct 2 17:27:15 2013 -0700

    making sure that plugins are minified and concated, adding Javascript style guide, adding uglify to all grunt tasks, adding the server.js and compiled js.

commit 1cade33fc4bdb4acb7791feaa68e96002761f3e4
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Sep 25 20:16:56 2013 -0400

    Update readme.md

commit d95037ee1b37e0583dd94012738bf60e10676790
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Wed Sep 25 20:14:04 2013 -0400

    nada

commit d8e45933a18c3d76eab309bd0cd1ddfdfeaa497d
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Wed Sep 25 18:29:01 2013 -0400

    moved the base css out

commit 785613953a7b1e238cdb6fb44610352c37087c7f
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Wed Sep 25 17:29:32 2013 -0400

    updated the gruntfile

commit e5ba799837a7d3f00d2e475714d54cf223467529
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Wed Sep 25 12:58:24 2013 -0700

    no need to include the compiled js or cs in the repo

commit 8bc3f331480e3100a4a3c8aee3c5f707c0cd6641
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Wed Sep 25 12:32:18 2013 -0700

    updating the gitignore to ignore log files, integrating forever with grunt. Auto-compiling coffeescript for forever

commit 3ba326b090b14b4544acacc20eddfc645e2667a0
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Wed Sep 25 11:44:23 2013 -0700

    updating the app layout

commit 7304de1324177578c6a0d2a426ca2a4429ab7bdb
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Wed Sep 25 01:07:19 2013 -0700

    updating files to rely on grunt as opposed to nib or stylus

commit c7e4fa12ef1fd6f6290d1e859859a8f275871b02
Author: Cameron Drake <cameron@drake.fm>
Date:   Wed Sep 25 00:47:44 2013 -0700

    Update style.sass

commit d2b1cf651a1ea5c8d83c616d7aeacefd0a064143
Merge: b74cfc2 d71a596
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Wed Sep 25 00:43:51 2013 -0700

    Merge branch 'master' of https://github.com/cdrake757/nodejs-boilerplate

commit b74cfc218ef88c24dc248040a312b681f819238b
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Wed Sep 25 00:32:49 2013 -0700

    using grunt.js fixed #1 fixed #5

commit d71a596ef916a0bca0314e0fa6f0216471cc4d6a
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Sep 24 19:48:22 2013 -0700

    Update SettingUpTheStack.md

commit 3178c11b7bdeba7b1090c12a8e8c8584f62604db
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Sep 24 19:47:18 2013 -0700

    Update SettingUpTheStack.md

commit 5c178b327962da92520e33b7b5f679d48a08b875
Merge: 9e3d3eb 773a270
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Sep 24 17:42:32 2013 -0700

    Merge branch 'master' of https://github.com/cdrake757/nodejs-boilerplate

commit 9e3d3ebf2e5004d9e53fed2ab830f3e76cfa7c20
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Sep 24 17:42:13 2013 -0700

    added more tutorials

commit 773a270d13b6fcbdd04748198964c17aa23345e8
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Sep 24 17:41:45 2013 -0700

    Update readme.md

commit d0d732c18384e9307e3defd1e0cbca5e24c02286
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Sep 24 17:39:24 2013 -0700

    Update SettingUpTheStack.md

commit fc366a177659b372f2504c6e94450df7cbaf7020
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Sep 24 17:37:53 2013 -0700

    Update SettingUpTheStack.md

commit 717d69aba57902523524d6dfc49cac27b227de32
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Sep 24 17:34:58 2013 -0700

    new tut

commit 59a81460e11aa90b7cb94341ebd4398ce098ce4b
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Sep 24 17:27:08 2013 -0700

    updating tutorials

commit 8649f21d9757609b25db7274ad0a49ec08d34a7a
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Sep 24 17:11:16 2013 -0700

    updated stack

commit 728f1ec94ce1465bf78550c6bdccf5188d892ac5
Merge: 4c19776 41b2bd0
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Sep 24 15:22:59 2013 -0700

    Merge branch 'master' of https://github.com/cdrake757/nodejs-boilerplate

commit 4c1977688c0b3f2e310a09998ab9f59d339d754a
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Sep 24 15:22:20 2013 -0700

    added a tutorial for setting up a development stack

commit 41b2bd08771394875a0df8e4ed976dc7accd8696
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Sep 24 15:05:25 2013 -0700

    Update readme.md

commit 0fcbc2d45558d200877c0ba00a32828f737faba4
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Sep 24 15:04:55 2013 -0700

    Update readme.md

commit 7bf3c4b70b9b01ca2271897d2cb298429063e410
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Sep 24 15:04:14 2013 -0700

    Update readme.md

commit dce3bc0f08c17ba59c55b54583167c116bba5d63
Author: Cameron Drake <cdrake757@gmail.com>
Date:   Tue Sep 24 13:48:00 2013 -0700

    updating the configs

commit a0e31d630094d9b1243a1aa7e05df93caeb7dff4
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Sep 24 13:43:23 2013 -0700

    Update readme.md

commit dc12ffa8338d49c8fa6f60085d216489a47974ed
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Sep 24 13:42:27 2013 -0700

    Update readme.md

commit a0340dccaac4f046aec007a758f4f84bf2c8452f
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Sep 24 13:41:04 2013 -0700

    Update readme.md

commit 673968a21171617e426530f602ca5db88bbcc6f3
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Sep 24 13:39:26 2013 -0700

    Update readme.md

commit f99cf669fa5e88d156917f4c8f4bdbf60d28f7e3
Author: Cameron Drake <cameron@drake.fm>
Date:   Tue Sep 24 13:32:42 2013 -0700

    Update readme.md
update structure