some light refactoring

We still need to firm this up a little more before switching to stored procedures that do roughly the same thing and having the map access a cached site/app map instead. Will incorporate redis option for cache persisting here soon
Update GenerateDatabase.sql
Merge pull request #7 from Approach/master

Major update
Merge pull request #7 from Approach/master

Major update
Merge branch 'master' of https://github.com/stealthpaladin/Approach
forced sync

Signed-off-by: Garet Claborn <garet@approachfoundation.org>
Merge pull request #8 from Approach/master

Spring Cleaning
project cleanup

Signed-off-by: Garet Claborn <garet@approachfoundation.org>
project cleanup

Signed-off-by: Garet Claborn <garet@approachfoundation.org>
Merge branch 'master' of https://github.com/stealthpaladin/Approach

Conflicts:
	project/support/templates/static/head_base.htm
	project/support/templates/static/home_slider.htm
	project/support/templates/static/navigation_bar.htm
	project/support/templates/static/service_nav.htm
	project/support/templates/static/service_signin.htm
Merge pull request #2 from stealthpaladin/master

getting back in sync