Merge remote-tracking branch 'dmalone/heatmaps'

Conflicts:
	tacc_stats_web/apps/tacc_stats/views.py
	tacc_stats_web/templates/tacc_stats/job_detail.html
Fixing up paths in views.
Fixing job_files_opened_heatmap misspelling.
Squashed commit of the following:

commit 775fdc43b45963792cf550b6be5f02ede3cd83d5
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Wed Feb 1 09:38:32 2012 -0600

    Update tacc_stats_web/templates/tacc_stats/job_detail.html

commit be27cdee13ec35f47e83bbd1ec9ad27039305f14
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Wed Feb 1 09:37:46 2012 -0600

    Removed deprecated imports.

commit 9d7c8caa5d4e59124be0919ac54f0eb9642d873f
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Wed Feb 1 09:37:06 2012 -0600

    Took out now useless methods.

commit 041a02450b80467a2531f8bdc9d9b07c311e6b98
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Mon Jan 30 10:56:57 2012 -0600

    Added a heatmap for flops, and combined all heatmap functions together into one cleaner function.
    Also fixed original amd_pmc64 mistakes.

commit 85b0e03b5b70192e1a537abc0b5f39e545be89e1
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Fri Jan 27 15:08:52 2012 -0600

    Editted job.py

commit 6b2fe76bf52450c682517eaffc49961f8ca4170d
Merge: 1bed1a1 751b763
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Wed Jan 25 13:41:12 2012 -0600

    Merge branch 'master' of github.com:TACCProjects/tacc_stats into heatmaps

    Conflicts:
    	tacc_stats_web/apps/tacc_stats/views.py

commit 1bed1a1de240c208c5f681603929ff6f9a3114cf
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Wed Jan 25 11:32:46 2012 -0600

    Made the requested changes to heatmaps
Squashed commit of the following:

commit 40a85e7eb6b645151714f92ed4de3b0b1da486fe
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Fri Feb 10 12:50:54 2012 -0600

    Added untracked files.

commit cae4c5d376ffd0fff56e3a4d9251d7617e576010
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Fri Feb 10 12:48:16 2012 -0600

    Added Forms and Search Function.

commit af0a9b5cd7f1ebb2b01b8117ca1e3816d2a4f431
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Thu Feb 2 11:10:05 2012 -0600

    Editted HTML files and changed models to make it easier to work with in HTML

commit 041a02450b80467a2531f8bdc9d9b07c311e6b98
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Mon Jan 30 10:56:57 2012 -0600

    Added a heatmap for flops, and combined all heatmap functions together into one cleaner function.
    Also fixed original amd_pmc64 mistakes.

commit 85b0e03b5b70192e1a537abc0b5f39e545be89e1
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Fri Jan 27 15:08:52 2012 -0600

    Editted job.py

commit 6b2fe76bf52450c682517eaffc49961f8ca4170d
Merge: 1bed1a1 751b763
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Wed Jan 25 13:41:12 2012 -0600

    Merge branch 'master' of github.com:TACCProjects/tacc_stats into heatmaps

    Conflicts:
    	tacc_stats_web/apps/tacc_stats/views.py

commit 1bed1a1de240c208c5f681603929ff6f9a3114cf
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Wed Jan 25 11:32:46 2012 -0600

    Made the requested changes to heatmaps
Getting plotting working on new tacc-stats server.
Squashed commit of the following:

commit a8be4920454f5db149bea4de8da1b1dcbc6c94d4
Author: Andy R. Terrel <andy.terrel@gmail.com>
Date:   Thu Mar 22 04:34:38 2012 -0500

    Fixing a few overwrites from master.

commit 1b1b4c0f36c08c64974766d4e3a984a956944080
Author: Andy R. Terrel <andy.terrel@gmail.com>
Date:   Thu Mar 22 04:26:59 2012 -0500

    Removing password.

commit a926fb26b2fed22a93dbb793b517395871346e23
Author: Drew Malone <dmalone@tacc-stats.tacc.utexas.edu>
Date:   Thu Mar 22 04:08:12 2012 -0500

    Squashed commit of the following:

    commit 79b65b321c215f51b897f1f14898603280e7beec
    Author: Drew Malone <dmalone@tacc-stats.tacc.utexas.edu>
    Date:   Thu Mar 22 03:48:17 2012 -0500

        added style.css

    commit b436e4226b75c68c1aa7a0574d12eade9d9a343f
    Author: Drew Malone <dmalone@tacc-stats.tacc.utexas.edu>
    Date:   Wed Mar 21 06:24:17 2012 -0500

        Added hosts page.

    commit 3a7e1e826a28af51738745c5ade4398fe97084db
    Author: Drew Malone <dmalone@tacc-stats.tacc.utexas.edu>
    Date:   Tue Mar 20 07:48:15 2012 -0500

        Improved Heatmaps, simplified code.

    commit 2db9553be90cf5b56ff54270c304a36f521820d9
    Author: Drew Malone <dmalone@tacc-stats.tacc.utexas.edu>
    Date:   Mon Mar 5 12:12:23 2012 -0600

        Changed tables, sized table rows, etc.

    commit be157b78c3d65fe6ab190e51e2cc702bd066a195
    Author: Drew Malone <dmalone@tacc-stats.tacc.utexas.edu>
    Date:   Wed Feb 29 22:50:48 2012 -0600

        Added DojoGrid.

    commit f41f036f99f1f7ab5c95c53a1d5a70598d6f44ff
    Author: Drew Malone <dmalone@tacc-stats.tacc.utexas.edu>
    Date:   Tue Feb 28 22:07:31 2012 -0600

        Added Legends to colors, fixed URLs, etc.

    commit 1f6c50a641311abe505fa7f52589f45043b36a7b
    Author: Drew Malone <dmalone@tacc-stats.tacc.utexas.edu>
    Date:   Wed Feb 22 20:33:37 2012 -0600

        Fixed Search Form Issues

commit 91e4f57307aba4077daedc91f3b126dfc570272e
Merge: 40a85e7 571e5ac
Author: Drew Malone <dmalone@tacc-stats.tacc.utexas.edu>
Date:   Mon Feb 20 09:44:02 2012 -0600

    Merge branch 'master' of github.com:dmalone/tacc_stats

commit 40a85e7eb6b645151714f92ed4de3b0b1da486fe
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Fri Feb 10 12:50:54 2012 -0600

    Added untracked files.

commit cae4c5d376ffd0fff56e3a4d9251d7617e576010
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Fri Feb 10 12:48:16 2012 -0600

    Added Forms and Search Function.

commit af0a9b5cd7f1ebb2b01b8117ca1e3816d2a4f431
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Thu Feb 2 11:10:05 2012 -0600

    Editted HTML files and changed models to make it easier to work with in HTML

commit 571e5ac3897fbe422cebfb55bdb0c0e8f5d357d4
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Wed Feb 1 09:31:00 2012 -0600

    Added Flops Heatmap.

commit 041a02450b80467a2531f8bdc9d9b07c311e6b98
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Mon Jan 30 10:56:57 2012 -0600

    Added a heatmap for flops, and combined all heatmap functions together into one cleaner function.
    Also fixed original amd_pmc64 mistakes.

commit 85b0e03b5b70192e1a537abc0b5f39e545be89e1
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Fri Jan 27 15:08:52 2012 -0600

    Editted job.py

commit 6b2fe76bf52450c682517eaffc49961f8ca4170d
Merge: 1bed1a1 751b763
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Wed Jan 25 13:41:12 2012 -0600

    Merge branch 'master' of github.com:TACCProjects/tacc_stats into heatmaps

    Conflicts:
    	tacc_stats_web/apps/tacc_stats/views.py

commit 1bed1a1de240c208c5f681603929ff6f9a3114cf
Author: Drew Malone <dmalone@tacc.utexas.edu>
Date:   Wed Jan 25 11:32:46 2012 -0600

    Made the requested changes to heatmaps
Merge branch 'master' of github.com:TACCProjects/tacc_stats