Squashed commit of the following:

commit 900747b45296235af837deb78dab943fccfc515c
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Sun Nov 3 18:51:22 2013 -0700

    don't build with j7 support within mallocplus for now.

commit 538a9b1f9b6e67c10311109bb0ab14f7aeff2a3d
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Sun Nov 3 12:44:32 2013 -0700

    fix build

commit e810c7e5f45cf674717917a5e960ee595e131d74
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Sun Nov 3 12:43:03 2013 -0700

    make things sane.

commit 4db2128102fcc109134651720e22be5fec9068f0
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Sat Nov 2 22:53:15 2013 -0600

    fix build

commit f50d932f41338cd042eea7f55f1e0e251e688234
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Sat Nov 2 19:11:46 2013 -0600

    i hate linux mint 15 because i can't debug anything... what a huge pos.

commit 901035044a63fc796d60b13e92fdb77b166cc397
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Sat Nov 2 14:28:10 2013 -0600

    fix crash. c++ you scare me sometimes...

commit a395be524e15c931cbd4613f36226ac990e0667f
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Sat Nov 2 14:18:44 2013 -0600

    stop crash. revert to orig cpp in mallocplus

commit be3a502841c5823f520996b4b30c20b8be1dd0c4
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Sat Nov 2 13:21:20 2013 -0600

    checkpoint. why is this crashing

commit 9c0845e81d7090af89600141dd79c4e51d9ab4ef
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Sat Nov 2 12:56:00 2013 -0600

    update test so allocs are different sizes

commit b035d1d37a1978d37f078d59bbec14f7dea7af2b
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Sat Nov 2 01:38:15 2013 -0600

    cleanup

commit 686c2fc55c7f10c37ba1207ecacc7e5cf8c4c507
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Sat Nov 2 01:17:40 2013 -0600

    rm ws

commit 5dea586c482facc8dad132da192d8f95b82c3d4d
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Sat Nov 2 01:17:17 2013 -0600

    fix realloc

commit f289f6716490b449000c4410751b98a026299224
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Sat Nov 2 00:28:59 2013 -0600

    more

commit f0bb8519d37afa07a5515cf8f36cf68cc7e0d494
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Sat Nov 2 00:19:46 2013 -0600

    more cleanup

commit fc1ca0f52bb0a41c64beef46302995b31f7f020a
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Sat Nov 2 00:07:46 2013 -0600

    more cleanup

commit 36bebdb9f0c2afbb22d17253fc73be7c77aec282
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Fri Nov 1 23:48:53 2013 -0600

    may be working. checkpoint

commit 9f48f751ca47dabe74ae2336dc053d614b1a5aae
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Fri Nov 1 15:42:00 2013 -0600

    Completely broken. Moving to another computer.

commit ebf64223358ada3e26fd0d7a7732d2dfd02e08fa
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Thu Oct 31 17:19:03 2013 -0600

    style

commit c7eb348278490fc9ed4aa667ea9cbaa411e6d51a
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Thu Oct 31 17:18:05 2013 -0600

    checkpoint

commit ba9972a686456d725d3e63181341d1f1b5d91846
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Mon Oct 28 15:09:21 2013 -0600

    add todo

commit 1e8479497bd33064736e9ea927a95928166256e9
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Fri Oct 25 08:43:38 2013 -0600

    rm TODO

commit ddef61dc78d1de80718a6d685a0f07e85cc9ccfb
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Thu Oct 24 20:08:16 2013 -0600

    add a TODO item

commit 1e372000fd855aa03a92dba2b084c42ed2e77cd0
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Thu Oct 24 17:24:56 2013 -0600

    checkpoint

commit f05239fb23957e878f68c12a13e33dbde2e6bb81
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Thu Oct 24 16:43:57 2013 -0600

    Add pid to sm seg name.

    Makes name conflicts on a node less likely.

commit 1575c18486413025ff505a7f026278a36252c57d
Author: Samuel K. Gutierrez <samuel@lanl.gov>
Date:   Thu Oct 24 16:20:42 2013 -0600

    start j7 and MallocPlus integration
Merge pull request #9 from samuelkgutierrez/master

Update J7 Support