merging dev branch into master

Squashed commit of the following:

commit 106c71ae4e1bf81420773874017cc9b2a3c48705
Author: Franklin E. Diaz <fediaz@indiana.edu>
Date:   Wed Jul 3 11:04:26 2013 -0400

    testing after validation

commit 591fc1c88185addef39d2f2c49b2e3cc9b300224
Author: Franklin E. Diaz <fediaz@indiana.edu>
Date:   Tue Jul 2 16:32:39 2013 -0400

    more changes

commit b7cf78a51d921ab38bca13b29bad41b031ba180e
Author: Franklin E. Diaz <fediaz@indiana.edu>
Date:   Tue Jul 2 16:11:22 2013 -0400

    alpha schema changes for jsonform

commit f2ff653465c19dc2d660e9879ef70d72274f3802
Author: Ezra Kissel <ezkissel@indiana.edu>
Date:   Thu Jun 27 15:42:45 2013 -0400

    adding basic service registration probe, does not return timeseries data
    this new probe could also report process stats, or that could be a separate probe altogether
    fix netlogger probe init arguments

commit f444e921a2a08ee5b2b92352cac6a4e3521a6be9
Author: mjaffee <mjaffee@indiana.edu>
Date:   Mon Jun 24 14:45:04 2013 -0400

    add per-probe on/off switch

commit 977bdd658f4383699059079a4b5c257df4a347a5
Author: mjaffee <mjaffee@indiana.edu>
Date:   Fri Jun 14 16:39:01 2013 -0400

    fix for blippd.py - key for unis_url had dash instead of underscore

commit e2e65ff5703e0d8a6b05b8733b1ad1c1b75d07ba
Author: mjaffee <mjaffee@indiana.edu>
Date:   Thu Jun 13 19:26:25 2013 -0400

    fix blippd logging bug

commit 4950d2d6892b96662a7257d07f404aaf59a59dea
Author: mjaffee <mjaffee@indiana.edu>
Date:   Thu Jun 13 17:30:14 2013 -0400

    add test config for adaptive scheduler

commit e91871a0f8fe08b0df82808dddd9dd55b6cf9043
Author: mjaffee <mjaffee@indiana.edu>
Date:   Thu Jun 13 14:21:27 2013 -0400

    pimp out adaptive scheduler with random wait awesomeness, convert schedulers to new API

commit d4ed09a3d68091a17b05cf16edde45e22c800610
Author: mjaffee <mjaffee@indiana.edu>
Date:   Wed Jun 12 17:51:11 2013 -0400

    forgot to change logger name in periscope_client

commit 7f2cace1bca86dde98d8b9d2d789b09aee406a97
Author: mjaffee <mjaffee@indiana.edu>
Date:   Wed Jun 12 17:50:40 2013 -0400

    bunch of bug fixes to adaptive scheduler... more to come in this dept.

commit e5870a16fb379cd1cd1f0e9c972bf66a6fe9667f
Author: mjaffee <mjaffee@indiana.edu>
Date:   Wed Jun 12 17:50:13 2013 -0400

    fix other probes to work with probe API changes

commit ef8c0baad8ea4456eae55c70394b76802149c970
Author: mjaffee <mjaffee@indiana.edu>
Date:   Wed Jun 12 17:49:27 2013 -0400

    add schema validation back into blipp_conf - accidentally removed it when restructuring

commit 7da0ff5851d9f49174fb2db0cba319bdf512d0bb
Author: mjaffee <mjaffee@indiana.edu>
Date:   Wed Jun 12 17:48:45 2013 -0400

    workaround for service not having a selfRef after PUTting to UNIS - UNIS is fixed now, so I'll have to rever this after testing it

commit 8974eb391917095bf65b134c497ac6e5f7dace04
Author: mjaffee <mjaffee@indiana.edu>
Date:   Tue Jun 11 20:01:58 2013 -0400

    fix metadata querying issue, add eventTypes to measurement on the fly (untested :), probes besides cpu are probably still broken

commit 63941bd3c8bb37969d3a83034949ca517e87bfd8
Author: mjaffee <mjaffee@indiana.edu>
Date:   Tue Jun 11 13:49:43 2013 -0400

    probe configuration is now stored solely as measurements which reference the service config. Measurements are POSTed on startup, and both measurement and service config is passed to probe_runners, probes, collectors, etc. Only the cpu probe has been updated to reflect this change

commit 4786550deea3a0dc93aa6b521709290ecc4e6c52
Author: mjaffee <mjaffee@indiana.edu>
Date:   Sun Jun 9 15:17:55 2013 -0400

    add build directories to gitignore

commit a50df370eac77e26c10c2ea7b55c66af4fb91955
Author: mjaffee <mjaffee@indiana.edu>
Date:   Sun Jun 9 15:17:39 2013 -0400

    move some functionality from ServiceConfigure to blippd, simplify ServiceConfigure

commit ecf7ab38506ab52fb9e2b0bf95050d57b06806a4
Author: mjaffee <mjaffee@indiana.edu>
Date:   Sat Jun 8 10:36:14 2013 -0400

    convert to docopt, rename start_blipp and probe_arbiter to blippd and arbiter

commit c4143726d29dcbdffd9719c65b91093a43f40c2c
Author: mjaffee <mjaffee@indiana.edu>
Date:   Wed Jun 12 11:36:19 2013 -0400

    fix import bug in adaptive scheduler

commit 89cd42e3f34f15b51bf6ea8098922c796e625e79
Author: mjaffee <mjaffee@indiana.edu>
Date:   Wed Jun 5 12:12:10 2013 -0400

    cleaner fix (i think) for handling missing probes section in config

commit ec2f6ddfad834a854821b16c21a6a9e8b12873bd
Author: Ezra Kissel <ezkissel@indiana.edu>
Date:   Wed Jun 5 11:55:09 2013 -0400

    fseek to keep reading new lines from netlogger file

commit af73b3414742e565cd14b21af0462596e9b9ee71
Author: Ezra Kissel <ezkissel@indiana.edu>
Date:   Tue Jun 4 16:54:00 2013 -0400

    working netlogger probe

    some fixes here and there

    need to add a netlog file watcher yet so the probe can keep pushing to the MS as the file is appended

commit 05f24e566a02351ffaa74c41cb6b7f82c80f2d4e
Author: Ezra Kissel <ezkissel@indiana.edu>
Date:   Tue Jun 4 13:41:16 2013 -0400

    allow blipp to start when there are no initial probes in the config

commit dcf4904de1c51f673c03c194de85593b2b86b2c0
Author: mjaffee <mjaffee@indiana.edu>
Date:   Thu May 30 13:36:37 2013 -0400

    make tests run

commit d0fddf3c634d24135fbbef22e1d7522d5584698e
Author: mjaffee <mjaffee@indiana.edu>
Date:   Thu May 30 13:34:58 2013 -0400

    add owping sample config

commit 375c944e35a0dce1cb8c5deb27864017a1acd4ba
Author: mjaffee <mjaffee@indiana.edu>
Date:   Thu May 30 13:16:23 2013 -0400

    some typos in a sample config

commit 649ab2341cf54ee4219cd24d5b604e94ff1924db
Author: mjaffee <mjaffee@indiana.edu>
Date:   Thu May 30 11:21:25 2013 -0400

    test py27 and py26

commit 281d5f5ac1857cc412b60347e2b2fc46a334aa23
Author: mjaffee <mjaffee@indiana.edu>
Date:   Mon May 27 14:04:27 2013 -0400

    add some extra comments to blipp source

commit bb0aca223047bfa9a33d258debf84227bf4364fb
Author: mjaffee <mjaffee@indiana.edu>
Date:   Sun May 26 17:32:16 2013 -0400

    default ssl_cert and ssl_key to None... should probably be in settings.py actually

commit 46a15aaf3b13d0ecbb823ec060a02a7635ca92e3
Author: mjaffee <mjaffee@indiana.edu>
Date:   Sun May 26 17:33:25 2013 -0400

    adding place for measurement schemas to be tracked, iperf, ping, owping are here

commit d36ee24fb576807e93b83ab8d44df47552db4613
Author: mjaffee <mjaffee@indiana.edu>
Date:   Wed May 22 22:23:58 2013 -0400

    clean up sample_config directory

commit 6f79da7b051045080abf93c13288fc96f35a3e2b
Author: mjaffee <mjaffee@indiana.edu>
Date:   Wed May 22 22:04:23 2013 -0400

    Add some info to README

commit 4becb4b4e0da182d926845c8ef4ff868ad24f731
Author: mjaffee <mjaffee@indiana.edu>
Date:   Wed May 22 17:30:25 2013 -0400

    update some sample configs

commit 5c96e07675980321d012fbb7bb7a5930c2c66061
Author: mjaffee <mjaffee@indiana.edu>
Date:   Tue May 21 22:24:29 2013 -0400

    more README updates

commit ebc7d34bfe28126c617f6a1db5447e0692102c8f
Author: mjaffee <mjaffee@indiana.edu>
Date:   Tue May 21 00:00:29 2013 -0400

    README fixes

commit 6fdbe318e1f1199e795c5a1e1951fd02f27cc6c5
Author: mjaffee <mjaffee@indiana.edu>
Date:   Mon May 20 23:56:17 2013 -0400

    apparently org SRC blocks are handled properly now

commit 752b5f72395029676e34afe12c437fe118fa9072
Author: mjaffee <mjaffee@indiana.edu>
Date:   Mon May 20 23:52:20 2013 -0400

    much needed README overhaul

commit f863cb8aa929e6d514baa0bdb47fa57903d230bd
Author: mjaffee <mjaffee@indiana.edu>
Date:   Mon May 20 17:07:31 2013 -0400

    add dummy probe and some timing to adaptive scheduler

commit 11169025b58565daf01a93199edc52d93bb0ceef
Author: mjaffee <mjaffee@indiana.edu>
Date:   Sat May 18 21:43:14 2013 -0400

    Load of changes... I got carried away.

    Fixed an issue where new probes were being started every time reload_all was called. This was due to adding measurement to the config in the collector.

    Removed some spurious junk from the service config that should never have been there.

    Some work on netlogger_probe that I probably should have committed before.

    Extra logging in probe_arbiter.

commit e62c7eb96a0b8c47d3c044d6b1dc89da91cc12ff
Author: mjaffee <mjaffee@indiana.edu>
Date:   Tue May 14 10:34:10 2013 -0400

    netlogger probe - change to probe api, probes can now return a list of dicts, and can set their own ts

commit 50645f672b6fddb910600441eccab60098607307
Author: mjaffee <mjaffee@indiana.edu>
Date:   Tue May 14 09:55:05 2013 -0400

    some adaptive scheduling refactoring and addition of new stuff... totally untested

commit 34e5ecca037faff318eab03865291360be27bff9
Author: mjaffee <mjaffee@indiana.edu>
Date:   Mon Apr 29 17:49:19 2013 -0400

    make regex in cmd_line_probe multiline to support owping

commit 0f239bd9615ab54727fc2d3d77c9ad9ca3bac3d1
Author: mjaffee <mjaffee@indiana.edu>
Date:   Mon Apr 29 12:58:10 2013 -0400

    change the way probe schemas and substitution for cmd_line_probe work in order to accomodate more complex options (iperf)

commit b0b5c760e9e06abdb1a8aee3411aee4d5f87c40a
Author: mjaffee <mjaffee@indiana.edu>
Date:   Thu Apr 25 15:44:11 2013 -0400

    add adaptive scheduler and some testing helpers

commit ec749572e5d5cc66ce0b237e0ffbb9dbf3a40e15
Author: mjaffee <mjaffee@indiana.edu>
Date:   Tue Apr 23 13:58:43 2013 -0400

    bug fixes and updates - blipp should now be working as intended with measurements as a resource in UNIS

commit 4b385a0b87bfbf88339c603915676e76b890cb83
Author: mjaffee <mjaffee@indiana.edu>
Date:   Tue Apr 23 00:07:11 2013 -0400

    add POST to /measurements and change metadata to link to the measurement that posted it, also switch some 'has_key' to 'in'

commit 8d3e81e8e169ee5ea26129dae173b9d9089ab48f
Author: mjaffee <mjaffee@indiana.edu>
Date:   Fri Apr 19 18:30:02 2013 -0400

    update gitignore

commit 57f6da83a93917c1166dbcadf8d2d206c5b21278
Author: mjaffee <mjaffee@indiana.edu>
Date:   Fri Apr 19 18:29:06 2013 -0400

    change to new conf style with named probes, and schema based defaults

commit b30f5a270d6fa7ef9121eff36aa8459fd0468ff7
Author: mjaffee <mjaffee@indiana.edu>
Date:   Thu Apr 18 19:32:50 2013 -0400

    add some utils for schema validation

commit 1d92b7e36f28cf445e684e34f41c22a93404a807
Author: mjaffee <mjaffee@indiana.edu>
Date:   Thu Apr 18 18:10:03 2013 -0400

    update cmd_line_probe to do argument substitution - add test

commit fc2f66551de05a20278dacb52d86e4764a065edf
Author: mjaffee <mjaffee@indiana.edu>
Date:   Thu Apr 18 17:58:05 2013 -0400

    fix collector test bug that was left over from a while ago

commit 26a2590e37ed5a89aeb54e1529d23c5c56521548
Author: mjaffee <mjaffee@indiana.edu>
Date:   Tue Mar 26 23:27:04 2013 -0400

    update gitignore with tox stuff

commit cdd231349a4527e8ecd3a3e730bd9d1c9a4fa1bd
Author: mjaffee <mjaffee@indiana.edu>
Date:   Tue Mar 26 22:56:40 2013 -0400

    defaults should be in settings.py, not scattered throughout the source

commit edfe858f6b0ea6b2b70157b6d20d00371043b6af
Author: mjaffee <mjaffee@indiana.edu>
Date:   Tue Mar 26 22:56:06 2013 -0400

    clean up settings.py, removing unneeded fields and so on

commit 97190106033ac593627fc4e1b0fdea34a317b783
Author: mjaffee <mjaffee@indiana.edu>
Date:   Tue Mar 26 22:54:38 2013 -0400

    flesh out the gitignore file

commit 7aee4c75baf847b91d9f6dfc577285b5ac91151c
Author: mjaffee <mjaffee@indiana.edu>
Date:   Tue Mar 26 22:54:22 2013 -0400

    add a super minimal config file to show what is strictly necessary