Squashed commit of the following:

commit 0514740854ea03cd7ab0e8253898a0fe9c9395a0
Merge: 23745eb ff0d269
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:55 2014 -0700

    Merge commit 'ff0d26955de2a2b1a85183373bf2bcb3668c3f70' as 'backend/tools/proboscis'

commit ff0d26955de2a2b1a85183373bf2bcb3668c3f70
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:55 2014 -0700

    Squashed 'backend/tools/proboscis/' content from commit 24a07eb

    git-subtree-dir: backend/tools/proboscis
    git-subtree-split: 24a07eb4684cbde5ae31b94d02573ca8ae8ff950

commit 23745ebee30dbac1512105fdf759d7340d7405b4
Merge: 24c9ae0 d6cb319
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:54 2014 -0700

    Merge commit 'd6cb31981c427194a74b80ded8009a413d9a0048' as 'backend/services/Panopticon'

commit 24c9ae04c2351313649a188922b39b171bb472c1
Merge: 2ff7bb7 fb1979b
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:54 2014 -0700

    Merge commit 'fb1979b39dfd276686cccc9cc01fda5eb8f38e89' as 'backend/services/OSM'

commit d6cb31981c427194a74b80ded8009a413d9a0048
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:54 2014 -0700

    Squashed 'backend/services/Panopticon/' content from commit 289d9f5

    git-subtree-dir: backend/services/Panopticon
    git-subtree-split: 289d9f5c0992ac14007798cb2cca190691be1e27

commit fb1979b39dfd276686cccc9cc01fda5eb8f38e89
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:54 2014 -0700

    Squashed 'backend/services/OSM/' content from commit a122499

    git-subtree-dir: backend/services/OSM
    git-subtree-split: a1224999d3d9e66f68707c8b46b5eafdf3924210

commit 2ff7bb7352b4cda0476d4bbc2a49de4a4fd4fae2
Merge: b999627 6a1629c
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:53 2014 -0700

    Merge commit '6a1629c308921269379a0ab3a81ffd9575b06e0a' as 'backend/services/NotificationAgent'

commit 6a1629c308921269379a0ab3a81ffd9575b06e0a
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:53 2014 -0700

    Squashed 'backend/services/NotificationAgent/' content from commit dcd58b4

    git-subtree-dir: backend/services/NotificationAgent
    git-subtree-split: dcd58b464200402f50fd5117efdb3a885547630c

commit b9996276b932a4c29ba8393b37692692a011b513
Merge: 503dac4 e0e2795
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:52 2014 -0700

    Merge commit 'e0e27959a4954402616554593b77ceadd14ba1f5' as 'backend/databases/notification-db'

commit 503dac4de548cfd999b288569be9c01273ba2864
Merge: a4b2941 052843a
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:52 2014 -0700

    Merge commit '052843a169123a3847d51230911e8aa7f1716c44' as 'backend/services/metadactyl-clj'

commit e0e27959a4954402616554593b77ceadd14ba1f5
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:52 2014 -0700

    Squashed 'backend/databases/notification-db/' content from commit 813f1fb

    git-subtree-dir: backend/databases/notification-db
    git-subtree-split: 813f1fb70457975e2db28fb596c59ac93dc102fb

commit 052843a169123a3847d51230911e8aa7f1716c44
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:52 2014 -0700

    Squashed 'backend/services/metadactyl-clj/' content from commit 63d0fe2

    git-subtree-dir: backend/services/metadactyl-clj
    git-subtree-split: 63d0fe2c6e9f128642e1d51d1117d25ad51eb6b2

commit a4b2941d01760272dcb5a9ed3012f14da5e3010a
Merge: 0373242 db7e639
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:51 2014 -0700

    Merge commit 'db7e639458646f01f37f09c7460119b6f4ebc797' as 'backend/libs/metadactyl'

commit db7e639458646f01f37f09c7460119b6f4ebc797
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:51 2014 -0700

    Squashed 'backend/libs/metadactyl/' content from commit c6dd8f3

    git-subtree-dir: backend/libs/metadactyl
    git-subtree-split: c6dd8f370d05dbab9d430b7d8d51e96685682799

commit 0373242d5ad80afb08ba7902ea4fab1369751e77
Merge: adcc548 2bebce1
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:50 2014 -0700

    Merge commit '2bebce1a83f21cd1b94672bb0dd6ce2aaf5f0ad4' as 'backend/libs/mescal'

commit 2bebce1a83f21cd1b94672bb0dd6ce2aaf5f0ad4
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:50 2014 -0700

    Squashed 'backend/libs/mescal/' content from commit 81430ce

    git-subtree-dir: backend/libs/mescal
    git-subtree-split: 81430cec1d11728122f79f20b620c8de08c60e73

commit adcc5484fada7b11d87c431055610615a4b79e62
Merge: 6046930 cb71454
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:49 2014 -0700

    Merge commit 'cb71454b266cc03bc193ea0cc1fc37d1e5769d16' as 'backend/lein-plugins/lein-sonatype-deploy'

commit 60469309b3b0c448dbfb9101fb27db7b9a61d055
Merge: d0c6fc4 c34d1ec
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:49 2014 -0700

    Merge commit 'c34d1ecbef2889374f99ee1f53a3a5f004bc2aa9' as 'backend/lein-plugins/lein-iplant-rpm'

commit cb71454b266cc03bc193ea0cc1fc37d1e5769d16
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:49 2014 -0700

    Squashed 'backend/lein-plugins/lein-sonatype-deploy/' content from commit eb748c0

    git-subtree-dir: backend/lein-plugins/lein-sonatype-deploy
    git-subtree-split: eb748c07eba3316bde5eb710b730bc952eaac447

commit c34d1ecbef2889374f99ee1f53a3a5f004bc2aa9
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:49 2014 -0700

    Squashed 'backend/lein-plugins/lein-iplant-rpm/' content from commit 1f27d36

    git-subtree-dir: backend/lein-plugins/lein-iplant-rpm
    git-subtree-split: 1f27d366080116bc138b02becc91f8075b4790dd

commit d0c6fc4a9e3606efb8832ea7f5a119f1654d1ab7
Merge: f8990c2 e8d2098
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:48 2014 -0700

    Merge commit 'e8d2098956f7b497030438565d6d350e0b20553f' as 'backend/lein-plugins/lein-iplant-cmdtar'

commit e8d2098956f7b497030438565d6d350e0b20553f
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:48 2014 -0700

    Squashed 'backend/lein-plugins/lein-iplant-cmdtar/' content from commit 4ad75a4

    git-subtree-dir: backend/lein-plugins/lein-iplant-cmdtar
    git-subtree-split: 4ad75a4afd9a711d1cb43e762c730444befe5517

commit f8990c22a3c4a48ace02d79ebd761cb7995c16c0
Merge: bf43637 2b9d19a
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:47 2014 -0700

    Merge commit '2b9d19aab58c9dc62ef6940b23e626027e0145de' as 'backend/lein-plugins/lein-deploy-more'

commit bf4363760d6dfa18a85303fde3b303e78e79cab2
Merge: 911dd20 79b5151
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:47 2014 -0700

    Merge commit '79b5151ef785a51d9bc2d0e2bb4b2a9080cd6ed3' as 'backend/services/kifshare'

commit 2b9d19aab58c9dc62ef6940b23e626027e0145de
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:47 2014 -0700

    Squashed 'backend/lein-plugins/lein-deploy-more/' content from commit 8c5aaea

    git-subtree-dir: backend/lein-plugins/lein-deploy-more
    git-subtree-split: 8c5aaea72b3c4eeff7148af014a5942f9e381468

commit 79b5151ef785a51d9bc2d0e2bb4b2a9080cd6ed3
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:47 2014 -0700

    Squashed 'backend/services/kifshare/' content from commit ab2f854

    git-subtree-dir: backend/services/kifshare
    git-subtree-split: ab2f8549290ff02752d8daae57282118d235a023

commit 911dd200e62e72dacd6d61bf7fc9e54f24aa5dbc
Merge: 5635636 472e2c2
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:46 2014 -0700

    Merge commit '472e2c26c3308f60c08217aaec1575cc8f40c00f' as 'backend/libs/kameleon'

commit 472e2c26c3308f60c08217aaec1575cc8f40c00f
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:46 2014 -0700

    Squashed 'backend/libs/kameleon/' content from commit c1320a9

    git-subtree-dir: backend/libs/kameleon
    git-subtree-split: c1320a9cad6f86f16324974fe4a021a7d0d191d2

commit 563563671a923d6015d7984503c04a460e40d3d3
Merge: 8131a36 a3929ed
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:45 2014 -0700

    Merge commit 'a3929ed44223a3d711a317cda47b81b068f51dfb' as 'backend/services/JEX'

commit a3929ed44223a3d711a317cda47b81b068f51dfb
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:45 2014 -0700

    Squashed 'backend/services/JEX/' content from commit 87064a4

    git-subtree-dir: backend/services/JEX
    git-subtree-split: 87064a42841a28b7bf909cafc76bd1fafa4f924f

commit 8131a369c18fba91a16ecf8fb38cc766ee11a889
Merge: 3346b3c ae244b4
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:44 2014 -0700

    Merge commit 'ae244b42147ad305c43c9d8fadbb3000ed8a6365' as 'backend/services/iplant-email'

commit 3346b3cd473e7780fdb7b0d501974bf849df74ab
Merge: e8e2046 e9333b3
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:44 2014 -0700

    Merge commit 'e9333b340e76de04b04d3c585d5e59b838cd059f' as 'backend/libs/iplant-clojure-commons'

commit ae244b42147ad305c43c9d8fadbb3000ed8a6365
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:44 2014 -0700

    Squashed 'backend/services/iplant-email/' content from commit 4ad3bfe

    git-subtree-dir: backend/services/iplant-email
    git-subtree-split: 4ad3bfe9fd044623e5d5ea7387629082ee542eed

commit e9333b340e76de04b04d3c585d5e59b838cd059f
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:44 2014 -0700

    Squashed 'backend/libs/iplant-clojure-commons/' content from commit 4ed5c4b

    git-subtree-dir: backend/libs/iplant-clojure-commons
    git-subtree-split: 4ed5c4b4f96a86cb0b365269a75af7fcc39ab57e

commit e8e2046edbf5972204dd3192d369598ae3a89123
Merge: 0e1c9ac 79eb637
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:43 2014 -0700

    Merge commit '79eb6379c035456b68a3dbfbbcedcf1d7cf10d12' as 'backend/services/Infosquito'

commit 79eb6379c035456b68a3dbfbbcedcf1d7cf10d12
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:43 2014 -0700

    Squashed 'backend/services/Infosquito/' content from commit a41123f

    git-subtree-dir: backend/services/Infosquito
    git-subtree-split: a41123fe6ebf7d40c9c1a7c0bea460084c0ab9be

commit 0e1c9aca11c2e55e44028499d4f3db5032f2edc3
Merge: 5acc2a2 7ce16a0
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:42 2014 -0700

    Merge commit '7ce16a0b3129653fd611aeccf83a611f8f0a6532' as 'backend/libs/hibernatetoolkit'

commit 5acc2a244caf4811ea2fd1ea6fa5397962b1e677
Merge: 16a206d 609f421
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:42 2014 -0700

    Merge commit '609f42151df1fab6e41c6b8bbc4512ee2bb7d7a5' as 'backend/libs/heuristomancer'

commit 7ce16a0b3129653fd611aeccf83a611f8f0a6532
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:42 2014 -0700

    Squashed 'backend/libs/hibernatetoolkit/' content from commit d87b95b

    git-subtree-dir: backend/libs/hibernatetoolkit
    git-subtree-split: d87b95bb1a1b2e385b17889dd44618293f4bddc0

commit 609f42151df1fab6e41c6b8bbc4512ee2bb7d7a5
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:42 2014 -0700

    Squashed 'backend/libs/heuristomancer/' content from commit 15707e0

    git-subtree-dir: backend/libs/heuristomancer
    git-subtree-split: 15707e0673dc8ec7cbf97159b931194d400ce9aa

commit 16a206dcdfac14f2398a764c9a6930b702d04f81
Merge: 4873391 5041327
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:41 2014 -0700

    Merge commit '50413279f0e2204dfd409fde0c32df5979d7727a' as 'backend/tools/filetool'

commit 50413279f0e2204dfd409fde0c32df5979d7727a
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:41 2014 -0700

    Squashed 'backend/tools/filetool/' content from commit 7000b86

    git-subtree-dir: backend/tools/filetool
    git-subtree-split: 7000b86606716d7b563a00015c370a335b0b9e91

commit 4873391a9cf5f6840fcdd250b4034cc9d8d304e5
Merge: 5f793cc 4ff602c
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:40 2014 -0700

    Merge commit '4ff602cd7bfc857a804d3de0f3db936c839276b5' as 'backend/tools/facepalm'

commit 4ff602cd7bfc857a804d3de0f3db936c839276b5
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:40 2014 -0700

    Squashed 'backend/tools/facepalm/' content from commit 40baeae

    git-subtree-dir: backend/tools/facepalm
    git-subtree-split: 40baeae03db67bc1d0cf61ebc97c2b40d46c24be

commit 5f793cceb70e5cc10f40d1dcc9421fc0cec44ea1
Merge: f93a787 6f0f1d2
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:39 2014 -0700

    Merge commit '6f0f1d266141fabf6be82ee36ef378d98b111f4e' as 'backend/services/Donkey'

commit f93a787588633e1b34337ea27140360b20690507
Merge: 249dd08 e9c637c
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:39 2014 -0700

    Merge commit 'e9c637c0f98d8874710269eb58ee4224e23b7d93' as 'backend/tools/dingle'

commit 6f0f1d266141fabf6be82ee36ef378d98b111f4e
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:39 2014 -0700

    Squashed 'backend/services/Donkey/' content from commit d3b8977

    git-subtree-dir: backend/services/Donkey
    git-subtree-split: d3b89770789ce937e52afa66c1648813c3c6d037

commit e9c637c0f98d8874710269eb58ee4224e23b7d93
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:39 2014 -0700

    Squashed 'backend/tools/dingle/' content from commit ce16b8a

    git-subtree-dir: backend/tools/dingle
    git-subtree-split: ce16b8ac70b0ebe9a858eafbb09dd351abc95811

commit 249dd08363a8f63f0dc4c79b4c96965df0fe2f48
Merge: 0f5a2b5 02dcb96
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:38 2014 -0700

    Merge commit '02dcb960d3b9de12063e63e44b4f5142f81e78d3' as 'backend/services/dewey'

commit 02dcb960d3b9de12063e63e44b4f5142f81e78d3
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:38 2014 -0700

    Squashed 'backend/services/dewey/' content from commit fed2d6c

    git-subtree-dir: backend/services/dewey
    git-subtree-split: fed2d6c1ba88effe8671b401f972874a4c3a05d4

commit 0f5a2b546faa35f4cc958f6f4f0c9c81a8f543ae
Merge: 78967a0 da9bcca
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:37 2014 -0700

    Merge commit 'da9bcca44668902ba05c5eea15951b70f46981f9' as 'backend/libs/de-persistence'

commit da9bcca44668902ba05c5eea15951b70f46981f9
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:37 2014 -0700

    Squashed 'backend/libs/de-persistence/' content from commit 4d243e4

    git-subtree-dir: backend/libs/de-persistence
    git-subtree-split: 4d243e4275859f8a1791f26cd0852be8bc242a0c

commit 78967a00fe352e02d2badbc74e0261f0bda5e11c
Merge: 9ed14fe 9446661
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:36 2014 -0700

    Merge commit '9446661b78cad09a2c970547e79a94d76a9609f8' as 'backend/databases/de-database-schema'

commit 9ed14fe427e2809ea11808b9f6759b773f9656eb
Merge: 99e67aa 139578a
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:36 2014 -0700

    Merge commit '139578a28d71d9a5c6c53dc26e25b6aca7ce417b' as 'backend/misc/de-base-services-pom'

commit 9446661b78cad09a2c970547e79a94d76a9609f8
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:36 2014 -0700

    Squashed 'backend/databases/de-database-schema/' content from commit 1c2afae

    git-subtree-dir: backend/databases/de-database-schema
    git-subtree-split: 1c2afae5e248c4b7416b4ae6d8fd430c336bd52b

commit 139578a28d71d9a5c6c53dc26e25b6aca7ce417b
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:36 2014 -0700

    Squashed 'backend/misc/de-base-services-pom/' content from commit 10c8712

    git-subtree-dir: backend/misc/de-base-services-pom
    git-subtree-split: 10c8712f442234cbc3b12493d2adabaf222eafa5

commit 99e67aae8ac315cdf45bc22f55904be2013bf1d9
Merge: aed2c1c a08f862
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:35 2014 -0700

    Merge commit 'a08f8628d66f778a7f5b9b9829faef70c35792a6' as 'backend/libs/de-authn'

commit a08f8628d66f778a7f5b9b9829faef70c35792a6
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:35 2014 -0700

    Squashed 'backend/libs/de-authn/' content from commit a645256

    git-subtree-dir: backend/libs/de-authn
    git-subtree-split: a645256da0cdacff89746af3883cb484e0a96ab5

commit aed2c1c72e9515053e1c4bca07432c03570141d2
Merge: 762d84e 7be5806
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:34 2014 -0700

    Merge commit '7be5806bf277548e11aa6c7f9f8927d36de2e354' as 'backend/services/Conrad'

commit 762d84e4234d1950750aeab193ca31480ed3bc93
Merge: 9192888 05c9d35
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:34 2014 -0700

    Merge commit '05c9d35d133d4fba24f1df7298ba85c512f6c9cf' as 'backend/services/clockwork'

commit 7be5806bf277548e11aa6c7f9f8927d36de2e354
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:34 2014 -0700

    Squashed 'backend/services/Conrad/' content from commit ea5b8ff

    git-subtree-dir: backend/services/Conrad
    git-subtree-split: ea5b8ff67874de6c8ee009f336a2a972ba39afa6

commit 05c9d35d133d4fba24f1df7298ba85c512f6c9cf
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:34 2014 -0700

    Squashed 'backend/services/clockwork/' content from commit 7becbb6

    git-subtree-dir: backend/services/clockwork
    git-subtree-split: 7becbb64b865d35b5b34fc9f03ce54d130af07a0

commit 919288891853aaeabfd07178f620d015c7084f4b
Merge: ef41461 d4fb4c0
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:33 2014 -0700

    Merge commit 'd4fb4c0801619ab9510498be6b42ef8c1fbe3614' as 'backend/libs/clj-jargon'

commit d4fb4c0801619ab9510498be6b42ef8c1fbe3614
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:33 2014 -0700

    Squashed 'backend/libs/clj-jargon/' content from commit 913bc77

    git-subtree-dir: backend/libs/clj-jargon
    git-subtree-split: 913bc771091348c70925b9f8e94fc5af1fb6ea68

commit ef414612dda9a6d52afadcaba82e089d576ed70f
Merge: dce8b72 74a191d
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:32 2014 -0700

    Merge commit '74a191d92493e0e2ed8416e7ee382458dc9da9e9' as 'backend/libs/clj-icat-direct'

commit dce8b72da60ff016b3fa3e0ee9222a44d286e8ad
Merge: 6f228c3 cb28f21
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:32 2014 -0700

    Merge commit 'cb28f219115a39f968b14d031e44415cc0f46d24' as 'backend/libs/clj-cas'

commit 74a191d92493e0e2ed8416e7ee382458dc9da9e9
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:32 2014 -0700

    Squashed 'backend/libs/clj-icat-direct/' content from commit 8dbb271

    git-subtree-dir: backend/libs/clj-icat-direct
    git-subtree-split: 8dbb27176ba919ffbd76b87184d3f676f0cd6fdf

commit cb28f219115a39f968b14d031e44415cc0f46d24
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:32 2014 -0700

    Squashed 'backend/libs/clj-cas/' content from commit e0fd11d

    git-subtree-dir: backend/libs/clj-cas
    git-subtree-split: e0fd11d888961ad5225a9eaaaf22da36a626cdda

commit 6f228c35324c03c79aa1518e2ecf7126f73c652e
Merge: b43ca86 d8ba266
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:31 2014 -0700

    Merge commit 'd8ba26632f7472c3e6aa25aaf2d8f656d7821aa6' as 'backend/libs/clavin-java'

commit d8ba26632f7472c3e6aa25aaf2d8f656d7821aa6
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:31 2014 -0700

    Squashed 'backend/libs/clavin-java/' content from commit 83544aa

    git-subtree-dir: backend/libs/clavin-java
    git-subtree-split: 83544aabf1446c2fcdbdca4bf28efb470ab9a2b6

commit b43ca8615f21645d1b873c8e4f7cf73b38151a42
Merge: 66230fc c0105be
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:30 2014 -0700

    Merge commit 'c0105be53a008a1bed8ad19da41c7bed886d9a0e' as 'backend/tools/clavin'

commit 66230fcc727d8fa8ecf6d67b286853d1ceab25c6
Merge: 992061b a74edd1
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:30 2014 -0700

    Merge commit 'a74edd1d6759316e0d5eaea75fed61a06b47e3fa' as 'backend/misc/cas-extenstions'

commit c0105be53a008a1bed8ad19da41c7bed886d9a0e
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:30 2014 -0700

    Squashed 'backend/tools/clavin/' content from commit c43f46c

    git-subtree-dir: backend/tools/clavin
    git-subtree-split: c43f46c1c2f4638f543dee29648c929cec340b4e

commit a74edd1d6759316e0d5eaea75fed61a06b47e3fa
Author: Jonathan Strootman <jstroot@iplantcollaborative.org>
Date:   Mon Mar 17 20:43:29 2014 -0700

    Squashed 'backend/misc/cas-extenstions/' content from commit 0736d5b

    git-subtree-dir: backend/misc/cas-extenstions
    git-subtree-split: 0736d5b17bde15c420066593c4cbfe5481a53532