Squashed commit of the following: Updating locations import to only use csv file.

commit daa421f1413cfa3d6a567029b8485e3c6b1e40a7
Merge: 74d8afe b280044
Author: Alex <aragsdale@schipul.com>
Date:   Fri Dec 21 13:33:35 2012 -0600

    Merge branch 'refs/heads/master' into 435_location_xls_import

commit 74d8afe7b39987389cac6c71a82614a203d91c95
Author: John Eddie Ayson <je@bixly.com>
Date:   Thu Dec 13 16:20:35 2012 +0800

    fixed bug for location import

commit 373d102fb9a91e891426044fe5fb6c6a6fd29289
Author: John Eddie Ayson <je@bixly.com>
Date:   Thu Dec 13 16:08:41 2012 +0800

    removed xls template in location import